diff --git a/MANIFEST.in b/MANIFEST.in
index 8d65859c..d70fbeab 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include README.rst
 include AUTHORS HACKING LICENSE
 include run_tests.sh tox.ini
-recursive-include docs *
+recursive-include doc *
 recursive-include tests *
 recursive-include tools *
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..567609b1
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/docs/.gitignore b/docs/.gitignore
deleted file mode 100644
index c6a151b3..00000000
--- a/docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_build/
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 77842830..925c4a37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,9 +4,9 @@ cover-erase = true
 cover-inclusive = true
 
 [build_sphinx]
-source-dir = docs/
-build-dir = docs/_build
+source-dir = doc/source
+build-dir = doc/build
 all_files = 1
 
 [upload_sphinx]
-upload-dir = docs/_build/html
+upload-dir = doc/build/html