diff --git a/debian/control b/debian/control
index 6ffd2ef5baa03eeca11c88eb845486d7ab196b91..24bd75641140f83f35b21a34d1866505d95cafdf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Matthias Klose <doko@debian.org>
 Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>, Barry Warsaw <barry@debian.org>
-Build-Depends: debhelper (>= 8~), debiandoc-sgml
+Build-Depends: debhelper (>= 8~), python-all, debiandoc-sgml
 Standards-Version: 3.9.5
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
diff --git a/debian/rules b/debian/rules
index 496b7f56e37ff86ce07cf972b7fb22f17cc8835d..95077cf10e748ee6ee422f73fad1741c4e3a6d90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ stamp-doc-policy:
 	debiandoc2html -l en.UTF-8 debian/python-policy.sgml
 	rm -rf debian/python-policy.html
 	mv -f python-policy.html debian/
-	make -C pydist README.PyDist.html
+	make -C pydist
 	touch stamp-doc-policy
 
 stamp-doc: stamp-doc-policy
@@ -114,6 +114,8 @@ MANPAGES ?= dh_python2.1 pycompile.1 pyclean.1
 
 # Manually run this rule if there is a need to update the dh_python2 man pages
 make-man: $(MANPAGES)
+	cd pydist && \
+	rst2html README.PyDist > README.PyDist.html
 
 clean: control-file
 	dh_testdir
@@ -173,7 +175,7 @@ stamp-dh_python:
 	dh_installdirs
 	-make check_versions
 	DESTDIR=debian/python PREFIX=/usr make install-dev
-	DESTDIR=debian/python-minimal PREFIX=/usr make install-runtime manpages
+	DESTDIR=debian/python-minimal PREFIX=/usr make install-runtime
 	# disabled by default, run manually if you want to update it
 	# (requires apt-file and network connection)
 	#make -C pydist dist_fallback
diff --git a/pydist/Makefile b/pydist/Makefile
index b24f306bb6f649c3648d84b82499aa1ff3f1e0dc..78e8796589205a8a531cbdcf1140076a10770798 100644
--- a/pydist/Makefile
+++ b/pydist/Makefile
@@ -3,12 +3,8 @@
 clean:
 	rm -rf cache
 	#rm -f dist_fallback
-	rm -f README.PyDist.html
 
 dist_fallback: sources.list
 	python ./generate_fallback_list.py --skip-sensible-names
 
-README.PyDist.html: README.PyDist
-	rst2html $< $@
-
 .PHONY: clean