diff --git a/docs/conf.py b/docs/conf.py
index f0af548f2..b9013457b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,6 +41,7 @@ extensions = [
 
 if on_rtd:
   extensions.append('sphinxcontrib.napoleon')
+  extensions.append('sphinxcontrib.websupport')
 else:
   extensions.append('sphinx.ext.napoleon')
 
diff --git a/setup.py b/setup.py
index 214bb14e8..b2c74039d 100644
--- a/setup.py
+++ b/setup.py
@@ -8,10 +8,10 @@ with open('requirements.txt') as f:
   requirements = f.read().splitlines()
 
 if on_rtd:
+  requirements.append('sphinx==1.6.5')
   requirements.append('sphinxcontrib-napoleon')
   requirements.append('sphinxcontrib-asyncio')
   requirements.append('sphinxcontrib-websupport')
-  requirements.append('sphinx==1.6.5')
 
 version = ''
 with open('discord/__init__.py') as f: