diff --git a/.gitignore b/.gitignore
index 8d3db152f..b1a98fd4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,5 +47,5 @@ __pycache__
 
 # documentation build artifacts
 
-docs/build
+docs/_build
 site/
diff --git a/docs/Makefile b/docs/Makefile
index d42f482b6..747126b3b 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,8 +5,8 @@
 # from the environment for the first two.
 SPHINXOPTS    ?= -n
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = source
-BUILDDIR      = build
+SOURCEDIR     = .
+BUILDDIR      = _build
 
 # Put it first so that "make" without argument is like "make help".
 help:
diff --git a/docs/source/_ext/djangodocs.py b/docs/_ext/djangodocs.py
similarity index 100%
rename from docs/source/_ext/djangodocs.py
rename to docs/_ext/djangodocs.py
diff --git a/docs/source/_static/custom.css b/docs/_static/custom.css
similarity index 100%
rename from docs/source/_static/custom.css
rename to docs/_static/custom.css
diff --git a/docs/source/conf.py b/docs/conf.py
similarity index 100%
rename from docs/source/conf.py
rename to docs/conf.py
diff --git a/docs/source/contents.rst b/docs/contents.rst
similarity index 100%
rename from docs/source/contents.rst
rename to docs/contents.rst
diff --git a/docs/source/faq.rst b/docs/faq.rst
similarity index 100%
rename from docs/source/faq.rst
rename to docs/faq.rst
diff --git a/docs/source/howto/contrib-apps.rst b/docs/howto/contrib-apps.rst
similarity index 100%
rename from docs/source/howto/contrib-apps.rst
rename to docs/howto/contrib-apps.rst
diff --git a/docs/source/howto/index.rst b/docs/howto/index.rst
similarity index 100%
rename from docs/source/howto/index.rst
rename to docs/howto/index.rst
diff --git a/docs/source/index.rst b/docs/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to docs/index.rst
diff --git a/docs/source/internals.rst b/docs/internals.rst
similarity index 100%
rename from docs/source/internals.rst
rename to docs/internals.rst
diff --git a/docs/source/intro/configure.rst b/docs/intro/configure.rst
similarity index 100%
rename from docs/source/intro/configure.rst
rename to docs/intro/configure.rst
diff --git a/docs/source/intro/index.rst b/docs/intro/index.rst
similarity index 100%
rename from docs/source/intro/index.rst
rename to docs/intro/index.rst
diff --git a/docs/source/intro/install.rst b/docs/intro/install.rst
similarity index 100%
rename from docs/source/intro/install.rst
rename to docs/intro/install.rst
diff --git a/docs/make.bat b/docs/make.bat
index cb012dbba..9655276d4 100755
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -7,8 +7,8 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set SOURCEDIR=source
-set BUILDDIR=build
+set SOURCEDIR=.
+set BUILDDIR=_build
 set SPHINXOPTS=-n
 
 %SPHINXBUILD% >NUL 2>NUL
diff --git a/docs/source/ref/contrib/gis.rst b/docs/ref/contrib/gis.rst
similarity index 100%
rename from docs/source/ref/contrib/gis.rst
rename to docs/ref/contrib/gis.rst
diff --git a/docs/source/ref/contrib/index.rst b/docs/ref/contrib/index.rst
similarity index 100%
rename from docs/source/ref/contrib/index.rst
rename to docs/ref/contrib/index.rst
diff --git a/docs/source/ref/database.rst b/docs/ref/database.rst
similarity index 100%
rename from docs/source/ref/database.rst
rename to docs/ref/database.rst
diff --git a/docs/source/ref/django-admin.rst b/docs/ref/django-admin.rst
similarity index 100%
rename from docs/source/ref/django-admin.rst
rename to docs/ref/django-admin.rst
diff --git a/docs/source/ref/forms.rst b/docs/ref/forms.rst
similarity index 100%
rename from docs/source/ref/forms.rst
rename to docs/ref/forms.rst
diff --git a/docs/source/ref/index.rst b/docs/ref/index.rst
similarity index 100%
rename from docs/source/ref/index.rst
rename to docs/ref/index.rst
diff --git a/docs/source/ref/models/fields.rst b/docs/ref/models/fields.rst
similarity index 100%
rename from docs/source/ref/models/fields.rst
rename to docs/ref/models/fields.rst
diff --git a/docs/source/ref/models/index.rst b/docs/ref/models/index.rst
similarity index 100%
rename from docs/source/ref/models/index.rst
rename to docs/ref/models/index.rst
diff --git a/docs/source/ref/models/indexes.rst b/docs/ref/models/indexes.rst
similarity index 100%
rename from docs/source/ref/models/indexes.rst
rename to docs/ref/models/indexes.rst
diff --git a/docs/source/ref/models/models.rst b/docs/ref/models/models.rst
similarity index 100%
rename from docs/source/ref/models/models.rst
rename to docs/ref/models/models.rst
diff --git a/docs/source/ref/models/querysets.rst b/docs/ref/models/querysets.rst
similarity index 100%
rename from docs/source/ref/models/querysets.rst
rename to docs/ref/models/querysets.rst
diff --git a/docs/source/ref/models/search.rst b/docs/ref/models/search.rst
similarity index 100%
rename from docs/source/ref/models/search.rst
rename to docs/ref/models/search.rst
diff --git a/docs/source/ref/utils.rst b/docs/ref/utils.rst
similarity index 100%
rename from docs/source/ref/utils.rst
rename to docs/ref/utils.rst
diff --git a/docs/source/releases/5.0.x.rst b/docs/releases/5.0.x.rst
similarity index 100%
rename from docs/source/releases/5.0.x.rst
rename to docs/releases/5.0.x.rst
diff --git a/docs/source/releases/5.1.x.rst b/docs/releases/5.1.x.rst
similarity index 100%
rename from docs/source/releases/5.1.x.rst
rename to docs/releases/5.1.x.rst
diff --git a/docs/source/releases/5.2.x.rst b/docs/releases/5.2.x.rst
similarity index 100%
rename from docs/source/releases/5.2.x.rst
rename to docs/releases/5.2.x.rst
diff --git a/docs/source/releases/index.rst b/docs/releases/index.rst
similarity index 100%
rename from docs/source/releases/index.rst
rename to docs/releases/index.rst
diff --git a/docs/source/topics/embedded-models.rst b/docs/topics/embedded-models.rst
similarity index 100%
rename from docs/source/topics/embedded-models.rst
rename to docs/topics/embedded-models.rst
diff --git a/docs/source/topics/index.rst b/docs/topics/index.rst
similarity index 100%
rename from docs/source/topics/index.rst
rename to docs/topics/index.rst
diff --git a/docs/source/topics/known-issues.rst b/docs/topics/known-issues.rst
similarity index 100%
rename from docs/source/topics/known-issues.rst
rename to docs/topics/known-issues.rst
diff --git a/docs/source/topics/transactions.rst b/docs/topics/transactions.rst
similarity index 100%
rename from docs/source/topics/transactions.rst
rename to docs/topics/transactions.rst