diff --git a/debian/changelog b/debian/changelog
index 7b3a39e51..ef1971c24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-tor (0.2.0.27-rc-X) Xxperimental; urgency=low
+tor (0.2.0.27-rc-1) experimental; urgency=low
 
   * New upstream version.
   * Add tor-geoipdb arch: all package for the geoip database.
+  * Update debian/rules so that there now is a binary-common target
+    and the binary-indep and binary-arch targets call make with
+    proper DH_OPTIONS options.  This is taken from the template
+    that dh_make nowadays uses for multi-binary packages.
   * Unit tests are broken, yay.
   * Use ${binary:Version} to depend on the right tor binary package from
     the tor-dbg package instead of ${Source-Version}.  Some guy on the
@@ -13,7 +17,7 @@ tor (0.2.0.27-rc-X) Xxperimental; urgency=low
   * Support passing of parallel=<n> in build options.
   * Change declared Standards-Version to 3.8.0.
 
- -- Peter Palfrader <weasel@debian.org>  Fri, 06 Jun 2008 00:59:24 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 06 Jun 2008 01:11:33 +0200
 
 tor (0.2.0.26-rc-1) experimental; urgency=critical
 
diff --git a/debian/rules b/debian/rules
index 808de8d13..af50d0414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -176,12 +176,10 @@ install: build
 
 	install -m 644 debian/tor-geoipdb.lintian-override $(CURDIR)/debian/tor-geoipdb/usr/share/lintian/overrides/tor-geoipdb
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs --package=tor ChangeLog
@@ -200,7 +198,15 @@ binary-arch: build install
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: install
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 	@if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then echo; echo; echo; echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Result of testsuite has been ignored.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-common binary-indep binary-arch binary install