diff --git a/Dockerfile-dev b/Dockerfile-dev
index 098fae523..dbb45f75e 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -58,7 +58,8 @@ RUN virtualenv --no-site-packages -p python2 /opt/certbot/venv && \
     -e /opt/certbot/src/certbot-nginx \
     -e /opt/certbot/src/letshelp-certbot \
     -e /opt/certbot/src/certbot-compatibility-test \
-    -e /opt/certbot/src[dev,docs]
+    -e /opt/certbot/src[dev,docs] && \
+    /opt/certbot/venv/bin/pip install -U setuptools
 
 # install in editable mode (-e) to save space: it's not possible to
 # "rm -rf /opt/certbot/src" (it's stays in the underlaying image);
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b2a8e9a3..00d3d4c72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,18 @@
-production:
-  build: .
-  ports:
-    - "443:443"
+version: '2'
+services:
+  production:
+    build: .
+    ports:
+      - "443:443"
 
 # For development, mount git root to /opt/certbot/src in order to
 # make the dev workflow more vagrant-like.
-development:
-  build: .
-  ports:
-    - "443:443"
-  volumes:
-    - .:/opt/certbot/src
-    - /opt/certbot/venv
+  development:
+    build:
+      context: .
+      dockerfile: Dockerfile-dev
+    ports:
+      - "443:443"
+    volumes:
+      - .:/opt/certbot/src
+      - /opt/certbot/venv
diff --git a/setup.py b/setup.py
index 529459cf0..0c47b973f 100644
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ dev_extras = [
     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
     'astroid==1.3.5',
     'coverage',
+    'ipdb',
     'nose',
     'pylint==1.4.2',  # upstream #248
     'tox',