diff --git a/docs/docsite/Makefile b/docs/docsite/Makefile
index 2669b9e4747..7978d697191 100644
--- a/docs/docsite/Makefile
+++ b/docs/docsite/Makefile
@@ -1,12 +1,11 @@
 SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 FORMATTER=../../hacking/module_formatter.py
 DUMPER=../../hacking/dump_playbook_attributes.py
-CPUS ?= 1
+CPUS := $(shell nproc)
 
 all: clean docs
 
-docs: clean directives modules staticmin
-	./build-site.py -j $(CPUS)
+docs: clean directives modules htmldocs
 	-(cp *.ico htmlout/)
 	-(cp *.jpg htmlout/)
 	-(cp *.png htmlout/)
@@ -15,16 +14,14 @@ variables:
 	(mkdir -p htmlout/)
 	dot variables.dot -Tpng -o htmlout/variables.png
 
-viewdocs: clean staticmin
-	./build-site.py -j $(CPUS) view
-
-htmldocs: staticmin
-	./build-site.py -j $(CPUS) rst
+htmldocs: directives modules staticmin
+	CPUS=$(CPUS) $(MAKE) -f Makefile.sphinx html
 
 webdocs: htmldocs
 
 clean:
 	-rm -rf htmlout
+	-rm -rf _build
 	-rm -f .buildinfo
 	-rm -f *.inv
 	-rm -rf *.doctrees
diff --git a/docs/docsite/Makefile.sphinx b/docs/docsite/Makefile.sphinx
new file mode 100644
index 00000000000..cddb40a8f4e
--- /dev/null
+++ b/docs/docsite/Makefile.sphinx
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    = -j $(CPUS)
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = sdfsdf
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile.sphinx
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile.sphinx
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/docsite/build.sh b/docs/docsite/build.sh
new file mode 100755
index 00000000000..968e9e25b8a
--- /dev/null
+++ b/docs/docsite/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+make -f Makefile.old clean
+make -f Makefile.old modules
+make -f Makefile.old directives
+
+time make html