diff --git a/requirements/dev.txt b/requirements/dev.txt
index 3d7c2b4811..e5aa2b7963 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -91,6 +91,7 @@ ndg-httpsclient==0.4.3
 oauth2client==4.1.2
 oauthlib==2.0.6
 ordereddict==1.1          # via gitlint
+packaging==16.8           # via sphinx
 parsel==1.2.0             # via scrapy
 parso==0.1.0              # via jedi
 pbr==3.1.1                # via mock
@@ -121,6 +122,7 @@ pyldap==2.4.37
 pylibmc==1.5.2
 pyoembed==0.1.2
 pyopenssl==17.3.0         # via ndg-httpsclient, scrapy, service-identity
+pyparsing==2.2.0          # via packaging
 pysocks==1.6.7            # via twilio
 python-dateutil==2.6.1
 python-digitalocean==1.12
@@ -151,7 +153,7 @@ social-auth-core==1.5.0   # via social-auth-app-django
 sockjs-tornado==1.0.3
 sourcemap==0.2.1
 sphinx-rtd-theme==0.2.4
-sphinx==1.6.5
+sphinx==1.7.0
 sphinxcontrib-websupport==1.0.1  # via sphinx
 sqlalchemy==1.1.14
 statsd==3.2.1             # via django-statsd-mozilla
diff --git a/requirements/docs.in b/requirements/docs.in
index 33344778cc..a00849aa78 100644
--- a/requirements/docs.in
+++ b/requirements/docs.in
@@ -8,7 +8,7 @@
 # See requirements/README.md for more detail.
 
 # Needed to build RTD docs
-sphinx==1.6.5
+sphinx==1.7.0
 sphinx-rtd-theme==0.2.4
 
 # Needed to build markdown docs
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 5d8547634d..f5f0d4dd6e 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -17,14 +17,16 @@ idna==2.6                 # via requests
 imagesize==0.7.1
 jinja2==2.10              # via sphinx
 markupsafe==1.0           # via jinja2
+packaging==16.8           # via sphinx
 pygments==2.2.0           # via sphinx
+pyparsing==2.2.0          # via packaging
 pytz==2017.3              # via babel
 recommonmark==0.4.0
 requests==2.18.4          # via sphinx
-six==1.11.0               # via sphinx
+six==1.11.0               # via packaging, sphinx
 snowballstemmer==1.2.1
 sphinx-rtd-theme==0.2.4
-sphinx==1.6.5
+sphinx==1.7.0
 sphinxcontrib-websupport==1.0.1  # via sphinx
 typing==3.6.2
 urllib3==1.22             # via requests
diff --git a/requirements/pip.txt b/requirements/pip.txt
index 2715596ff6..5d89a845fe 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -1,4 +1,4 @@
 # Dependencies for setting up pip to install our requirements.txt file.
-setuptools==36.6.0
+setuptools==38.5.1.
 pip==9.0.1
 wheel==0.30.0