diff --git a/docs/source/conf.py b/doc/source/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to doc/source/conf.py
diff --git a/docs/source/contributing.rst b/doc/source/contributing.rst
similarity index 52%
rename from docs/source/contributing.rst
rename to doc/source/contributing.rst
index 1728a61ca..5fcfaebc5 100644
--- a/docs/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1,4 +1,3 @@
 ============
 Contributing
 ============
-.. include:: ../../CONTRIBUTING.rst
diff --git a/docs/source/index.rst b/doc/source/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to doc/source/index.rst
diff --git a/docs/source/installation.rst b/doc/source/installation.rst
similarity index 100%
rename from docs/source/installation.rst
rename to doc/source/installation.rst
diff --git a/docs/source/readme.rst b/doc/source/readme.rst
similarity index 100%
rename from docs/source/readme.rst
rename to doc/source/readme.rst
diff --git a/docs/source/usage.rst b/doc/source/usage.rst
similarity index 100%
rename from docs/source/usage.rst
rename to doc/source/usage.rst
diff --git a/setup.cfg b/setup.cfg
index 29317ccc4..5c9b6e8ee 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,13 +21,13 @@ classifier =
 #packages =
 #    browbeat
 
-#[build_sphinx]
-#source-dir = doc/source
-#build-dir = doc/build
-#all_files = 1
+[build_sphinx]
+source-dir = doc/source
+build-dir = doc/build
+all_files = 1
 
-#[upload_sphinx]
-#upload-dir = doc/build/html
+[upload_sphinx]
+upload-dir = doc/build/html
 
 #[compile_catalog]
 #directory = browbeat/locale