diff --git a/Makefile b/Makefile
index c81ea2fbc6..106dfd97e3 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ pypi_stable: check_clean_working_copy check_running_on_jenkins
 	|| $(python) setup.py egg_info register sdist bdist_egg upload
 
 docs:
-	cd doc && make html
+	cd docs && make html
 
 _docs:
-	cd doc && make clean
+	cd docs && make clean
diff --git a/doc/jobTreeSlides.pdf b/attic/jobTreeSlides.pdf
similarity index 100%
rename from doc/jobTreeSlides.pdf
rename to attic/jobTreeSlides.pdf
diff --git a/doc/Makefile b/docs/Makefile
similarity index 100%
rename from doc/Makefile
rename to docs/Makefile
diff --git a/doc/code.rst b/docs/code.rst
similarity index 100%
rename from doc/code.rst
rename to docs/code.rst
diff --git a/doc/conf.py b/docs/conf.py
similarity index 100%
rename from doc/conf.py
rename to docs/conf.py
diff --git a/doc/index.rst b/docs/index.rst
similarity index 100%
rename from doc/index.rst
rename to docs/index.rst