diff --git a/.gitignore b/.gitignore
index 6317e5b05..b793b5655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
 vendor/*
 Gemfile.lock
 packstack.egg-info
+docs/build
 releasenotes/build
 .stestr
diff --git a/docs/conf.py b/docs/source/conf.py
similarity index 100%
rename from docs/conf.py
rename to docs/source/conf.py
diff --git a/docs/packstack.rst b/docs/source/packstack.rst
similarity index 100%
rename from docs/packstack.rst
rename to docs/source/packstack.rst
diff --git a/packstack/installer/basedefs.py b/packstack/installer/basedefs.py
index ec8ca885f..eddded217 100644
--- a/packstack/installer/basedefs.py
+++ b/packstack/installer/basedefs.py
@@ -30,7 +30,7 @@ FILE_YUM_VERSION_LOCK = "/etc/yum/pluginconf.d/versionlock.list"
 
 PACKSTACK_SRC_DOC = os.path.realpath(
     os.path.join(os.path.abspath(
-        packstack.__path__[0]), '..', 'docs/packstack.rst'
+        packstack.__path__[0]), '..', 'docs/source/packstack.rst'
     )
 )
 if os.path.exists(PACKSTACK_SRC_DOC):
diff --git a/setup.cfg b/setup.cfg
index f1b3f2a96..520f3d443 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,7 +23,7 @@ packages =
     packstack
 
 data_files =
-    share/packstack = docs/packstack.rst
+    share/packstack = docs/source/packstack.rst
 
 [global]
 setup-hooks =
diff --git a/tox.ini b/tox.ini
index bdaac8556..188ad6379 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,7 +31,7 @@ setenv = NOSE_WITH_COVERAGE=1
 commands = {posargs}
 
 [testenv:docs]
-commands = sphinx-build -a -E -W -d docs/build/doctrees -b html docs docs/build/html
+commands = sphinx-build -a -E -W -d docs/build/doctrees -b html docs/source docs/build/html
 
 [testenv:releasenotes]
 deps = -r{toxinidir}/test-requirements.txt