diff --git a/debian/changelog b/debian/changelog
index 84f6c7eea..86d0e3638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ linux (4.8~rc4-1~exp1) UNRELEASED; urgency=medium
     - [armhf] Enable IIO_ST_ACCEL_3AXIS as module instead of LIS3L02DQ
     * [hppa] Enable RTC_CLASS and RTC_DRV_GENERIC instead of GEN_RTC
   * liblockdep: Stop trying to build packages, as it failed to build again
+  * linux-doc: Build and install HTML pages from reStructuredText sources
+    - Add python-sphinx and python-sphinx-rtd-theme to Build-Depends-Indep
+    - Install files from both HTML output directories into the package
+    - Exclude RST sources from the package
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 28 Aug 2016 19:01:59 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 81a6a1704..e320c822f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -222,12 +222,22 @@ install-doc: $(STAMPS_DIR)/build-doc
 	mkdir -p $(OUT_DIR)
 	set -o pipefail; \
 	find CREDITS MAINTAINERS README REPORTING-BUGS Documentation \
-		-name '.gitignore' -prune -o -name DocBook -prune -o -print | \
+		-name '.gitignore' -prune -o -name DocBook -prune -o \
+		-name '*.rst' -prune -o -path Documentation/media -prune -o \
+		-print | \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)'
+# Some HTML pages are generated by xmlto from DocBook XML and some by
+# Sphinx from reStructedText.  Unfortunately these each generate their
+# own top level index.html, so we put them in two separate
+# subdirectories until the conversion to RST is complete.
 	set -o pipefail; \
 	cd $(DIR)/Documentation/DocBook; \
 	find * -name '*.html' -print | \
-	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html'
+	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/oldstyle'
+	set -o pipefail; \
+	cd $(DIR)/Documentation/output/html; \
+	find * -name objects.inv -prune -o -print | \
+	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/newstyle'
 	gzip -9nqfr $(OUT_DIR)/Documentation
 	+$(MAKE_SELF) install-base
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 21e93a347..070db662a 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -58,6 +58,8 @@ Build-Depends-Indep:
 # used by debian/rules.real to build linux-source
  patchutils <!stage1>,
 # used by upstream to build documentation
+ python-sphinx <!stage1 !nodoc>,
+ python-sphinx-rtd-theme <!stage1 !nodoc>,
  xmlto <!stage1 !nodoc>,
 Vcs-Git: https://anonscm.debian.org/git/kernel/linux.git
 Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux.git