diff --git a/docs/conf.py b/docs/source/conf.py
similarity index 98%
rename from docs/conf.py
rename to docs/source/conf.py
index b2c9a85..8eb44c9 100644
--- a/docs/conf.py
+++ b/docs/source/conf.py
@@ -19,7 +19,8 @@ import sys, os
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+sys.path.append(
+    os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
 # General configuration
 # ---------------------
diff --git a/docs/credits.rst b/docs/source/credits.rst
similarity index 100%
rename from docs/credits.rst
rename to docs/source/credits.rst
diff --git a/docs/devdocs.rst b/docs/source/devdocs.rst
similarity index 100%
rename from docs/devdocs.rst
rename to docs/source/devdocs.rst
diff --git a/docs/index.rst b/docs/source/index.rst
similarity index 100%
rename from docs/index.rst
rename to docs/source/index.rst
diff --git a/docs/sourcecode.rst b/docs/source/sourcecode.rst
similarity index 100%
rename from docs/sourcecode.rst
rename to docs/source/sourcecode.rst
diff --git a/setup.cfg b/setup.cfg
index 3b1d4d5..e1069a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ tag_svn_revision = true
 find_links = http://www.pylonshq.com/download/
 
 [build_sphinx]
-source-dir = docs
+source-dir = docs/source
 build-dir = docs/html
 all_files = 1