diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 42469fd9..00000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-sphinxcontrib-httpdomain
-sphinxcontrib-napoleon
-sphinx_rtd_theme
diff --git a/requirements-dev.txt b/requirements-dev.txt
index b3f117e0..cac003f2 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,12 @@
+# Testing dependencies
 mock>=1.0.1
 nose>=1.3.0
-sphinxcontrib-httpdomain
-sphinx_rtd_theme
-po2json
 ddt
+
+# Documentation dependencies
+sphinxcontrib-httpdomain
+sphinxcontrib-napoleon
+sphinx_rtd_theme
+
+# Translation dependencies
+po2json
diff --git a/setup.py b/setup.py
index 6a875439..3d2b59a3 100644
--- a/setup.py
+++ b/setup.py
@@ -250,6 +250,10 @@ def get_cmdclass():
 	return cmdclass
 
 
+def requirements(filename):
+	return filter(lambda line: line and not line.startswith("#"), map(lambda line: line.strip(), open(filename).read().split("\n")))
+
+
 def params():
 	name = "OctoPrint"
 	version = versioneer.get_version()
@@ -287,11 +291,17 @@ def params():
 
 	include_package_data = True
 	zip_safe = False
-	install_requires = open("requirements.txt").read().split("\n")
+	install_requires = requirements("requirements.txt")
 	extras_require = dict(
-		develop=open("requirements-dev.txt").read().split("\n")
+		develop=requirements("requirements-dev.txt")
 	)
 
+	if os.environ.get('READTHEDOCS', None) == 'True':
+		# we can't tell read the docs to please perform a pip install -e .[develop], so we help
+		# it a bit here by explicitely adding the development dependencies, which include our
+		# documentation dependencies
+		install_requires = install_requires + extras_require['develop']
+
 	entry_points = {
 		"console_scripts": [
 			"octoprint = octoprint:main"