diff --git a/debian/rules.real b/debian/rules.real
index 24530d4dd..6348c5731 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -65,6 +65,7 @@ ifeq ($(MODULES),True)
 endif
 
 binary-indep: install-doc
+binary-indep: install-manual
 binary-indep: install-patch
 binary-indep: install-source
 binary-indep: install-support
@@ -162,6 +163,14 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(SUBARCH) $(FLAVOUR)
 	touch '$@'
 
+$(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
+$(STAMPS_DIR)/build-doc:
+	rm -rf '$(DIR)'
+	cp -al '$(SOURCE_DIR)' '$(DIR)'
+	$(setup_env) make -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
+	touch '$@'
+
 install-base:
 	dh_installchangelogs
 	dh_installdocs
@@ -172,20 +181,13 @@ install-base:
 	dh_md5sums
 	dh_builddeb
 
-install-doc: PACKAGE_NAME_DOC = linux-doc-$(VERSION)
-install-doc: PACKAGE_NAME_MANUAL = linux-manual-$(VERSION)
-install-doc: SOURCE_DIR=$(BUILD_DIR)/source
-install-doc: DIR=$(BUILD_DIR)/$@
-install-doc: PACKAGE_DIR_DOC = $(CURDIR)/debian/$(PACKAGE_NAME_DOC)
-install-doc: PACKAGE_DIR_MANUAL = $(CURDIR)/debian/$(PACKAGE_NAME_MANUAL)
-install-doc: OUT_DIR_DOC = $(PACKAGE_DIR_DOC)/usr/share/doc/$(PACKAGE_NAME_DOC)
-install-doc: DH_OPTIONS = -p$(PACKAGE_NAME_DOC) -p$(PACKAGE_NAME_MANUAL)
-install-doc: $(STAMPS_DIR)/source
-	rm -rf '$(DIR)'
-	cp -al '$(SOURCE_DIR)' '$(DIR)'
+install-doc: PACKAGE_NAME = linux-doc-$(VERSION)
+install-doc: DIR = $(BUILD_DIR)/build-doc
+install-doc: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-doc: OUT_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
+install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-doc: $(STAMPS_DIR)/build-doc
 	dh_clean -d -k
-	cd '$(DIR)'; $(setup_env) make $(JOBS_ARG) htmldocs mandocs
-	DH_OPTIONS= dh_installman -p$(PACKAGE_NAME_MANUAL) '$(DIR)/Documentation/DocBook/'*.9 '$(DIR)/Documentation/DocBook/man/'*.9
 	cd $(DIR)/Documentation; \
 	find . \
 	  -path './DocBook/man/*' -prune -o \
@@ -193,9 +195,18 @@ install-doc: $(STAMPS_DIR)/source
 	  \( -name 'Makefile*' -o -name '.*.cmd' -o -name '.gitignore' \) -prune -o \
 	  -print \
 	| \
-	cpio -pd --preserve-modification-time '$(OUT_DIR_DOC)/Documentation'
-	mv '$(OUT_DIR_DOC)/Documentation/DocBook' '$(OUT_DIR_DOC)/html'
-	-gzip -9qfr '$(OUT_DIR_DOC)/Documentation'
+	cpio -pd --preserve-modification-time '$(OUT_DIR)/Documentation'
+	mv '$(OUT_DIR)/Documentation/DocBook' '$(OUT_DIR)/html'
+	-gzip -9qfr '$(OUT_DIR)/Documentation'
+	$(MAKE) -f debian/rules.real install-base
+
+install-manual: PACKAGE_NAME = linux-manual-$(VERSION)
+install-manual: DIR=$(BUILD_DIR)/build-doc
+install-manual: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-manual: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-manual: $(STAMPS_DIR)/build-doc
+	dh_clean -d -k
+	find '$(DIR)/Documentation/DocBook/' -name '*.9' | xargs dh_installman
 	$(MAKE) -f debian/rules.real install-base
 
 install-dummy: