diff --git a/debian/changelog b/debian/changelog
index 15ad35612a7aa2b37b663d8406bf96101d8c23d3..4f57f41edaa227c6a3cedfca3a380df8576865d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tor (0.2.2.9-alphXXXXXXX) XXXerimental; urgency=low
+
+  * debian/rules:
+    - make manpage building properly depend on patch-stamp,
+    - Fix building in the absence of a debian/micro-revision.i file.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 03 Mar 2010 23:51:35 +0100
+
 tor (0.2.2.9-alpha-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/debian/rules b/debian/rules
index 3ccdfe64c0fc14a1e13b284bf02a75af4c392bd9..23e2b567362b1b0552adb01442004ab88a3da15a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ build: build-stamp
 
 # create the manpages here because the build-system shipped in the tarball is
 # incomplete.  moving foo.8 to foo.1.in is intended.
-doc/%.1.in: doc/%.1.txt
+doc/%.1.in: doc/%.1.txt patch-stamp
 	target="$@"; base="$${target%%.1.in}"; \
 		a2x -f manpage "$$base".1.txt && \
 		if [ -e "$$base".1 ]; then mv "$$base".1 "$$base".1.in; \
@@ -97,7 +97,7 @@ doc/%.1.in: doc/%.1.txt
 
 build-stamp:  config.status $(MANPAGE_INS)
 	dh_testdir
-	! [ debian/micro-revision.i ] || cp debian/micro-revision.i src/or/micro-revision.i
+	! [ -e debian/micro-revision.i ] || cp debian/micro-revision.i src/or/micro-revision.i
 
 	# Also touch all the .html files or else the build system will
 	# try to re-create them and fail badly