diff --git a/Dockerfile b/Dockerfile
index d157179f..81b0bd93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,10 @@ WORKDIR /c3nav/src
 COPY deployment/docker/c3nav.bash /usr/local/bin/c3nav
 
 RUN pip install -U pip wheel setuptools
-RUN pip install -r requirements.txt -r requirements/production-extra.txt -r requirements/postgres.txt \
-                -r requirements/memcached.txt -r requirements/redis.txt gunicorn \
+RUN pip install matplotlib --only-binary :all:
+RUN pip install -r requirements.txt -r requirements/production-extra.txt -r requirements/htmlmin.txt
+                -r requirements/postgres.txt -r requirements/memcached.txt -r requirements/redis.txt gunicorn \
+
  && chmod +x /usr/local/bin/c3nav
 
 RUN python manage.py collectstatic --no-input \
diff --git a/src/requirements.txt b/src/requirements.txt
index ea77c2d8..b505e866 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1 +1,2 @@
 -r requirements/production.txt
+-r requirements/production-extra.txt
diff --git a/src/requirements/htmlmin.txt b/src/requirements/htmlmin.txt
new file mode 100644
index 00000000..6c909096
--- /dev/null
+++ b/src/requirements/htmlmin.txt
@@ -0,0 +1 @@
+django-htmlmin>=0.10,<0.11
diff --git a/src/requirements/production-extra.txt b/src/requirements/production-extra.txt
index 6c909096..f53017e4 100644
--- a/src/requirements/production-extra.txt
+++ b/src/requirements/production-extra.txt
@@ -1 +1,2 @@
-django-htmlmin>=0.10,<0.11
+matplotlib>=1.5.3,<1.6
+scipy>=0.18.1,<0.19
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
index 5af258ca..3a56ecce 100644
--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -8,6 +8,4 @@ shapely>=1.5,<1.6
 celery>=3.1,<3.2
 requests>=2.11,<2.12
 Pillow>=3.4.2,<3.5
-matplotlib>=1.5.3,<1.6
-scipy>=0.18.1,<0.19
 qrcode>=5.3,<5.4