diff --git a/debian/changelog b/debian/changelog
index a1c8eb3056..234de20f59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+tor (0.2.1.16-rc-1) experimental; urgency=low
+
+  * New upstream version.
+  * No longer inform the user if/when we re-create the /var/run/tor
+    directory in the init script.  With /var/run on tmpfs this is
+    completely normal now so our message was just noise.
+  * Stop shipping /var/run/tor in the package.
+  * Only clean up permissions of /var/run/tor in postinst if the
+    directory actually exists.
+  * Update Standards-Version from 3.8.0 to 3.8.1.  No real changes
+    required, we already support nocheck in DEB_BUILD_OPTIONS since
+    August 2004, and we already create our var/run directory in the
+    init script (tho we now no longer ship it either - see above).
+  * Change debhelper compatibility version from 4 to 5:
+    - Change dh_strip call from --dbg-package=tor
+      to --dbg-package=tor-dbg.
+    - Update versioned build time dependency on debhelper.
+  * Forward port 06_add_compile_time_defaults.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 20 Jun 2009 13:16:02 +0200
+
 tor (0.2.1.15-rc-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/debian/compat b/debian/compat
index b8626c4cff..7ed6ff82de 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 1d13e7f737..79ba422307 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tor
 Section: comm
 Priority: optional
 Maintainer: Peter Palfrader <weasel@debian.org>
-Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, ghostscript, binutils (>= 2.14.90.0.7)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, ghostscript, binutils (>= 2.14.90.0.7)
+Standards-Version: 3.8.1
 Homepage: https://www.torproject.org/
 
 Package: tor
diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch
index 7dfce2ef23..a2472d1db8 100755
--- a/debian/patches/06_add_compile_time_defaults.dpatch
+++ b/debian/patches/06_add_compile_time_defaults.dpatch
@@ -50,7 +50,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c
 +  if (debian_config_fix_defaults() < 0)
 +    goto err;
 +
-   if (argv) { /* first time we're called. save commandline args */
+   if (argv) { /* first time we're called. save command line args */
      backup_argv = argv;
      backup_argc = argc;
 @@ -5307,3 +5313,62 @@
diff --git a/debian/rules b/debian/rules
index 797d67ea5a..f5aaa95545 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,8 +189,7 @@ binary-common:
 	dh_installinit
 	dh_installman
 	dh_link
-	# Change this for debhelper compatibility level 5 or later!
-	dh_strip --dbg-package=tor
+	dh_strip --dbg-package=tor-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff --git a/debian/tor.dirs b/debian/tor.dirs
index ca9f98af2d..72d914a77b 100644
--- a/debian/tor.dirs
+++ b/debian/tor.dirs
@@ -1,7 +1,6 @@
 etc/tor
 var/lib/tor
 var/log/tor
-var/run/tor
 usr/share/lintian/overrides
 usr/bin
 usr/sbin
diff --git a/debian/tor.init b/debian/tor.init
index a798c0cdf2..b018847c08 100644
--- a/debian/tor.init
+++ b/debian/tor.init
@@ -88,7 +88,7 @@ wait_for_deaddaemon () {
 
 check_torpiddir () {
 	if test ! -d $TORPIDDIR; then
-		echo "There is no $TORPIDDIR directory.  Creating one for you."
+		#echo "There is no $TORPIDDIR directory.  Creating one for you."
 		mkdir -m 02700 "$TORPIDDIR"
 		chown debian-tor:debian-tor "$TORPIDDIR"
 	fi
diff --git a/debian/tor.postinst b/debian/tor.postinst
index 29d0984298..b9ac61596f 100644
--- a/debian/tor.postinst
+++ b/debian/tor.postinst
@@ -43,9 +43,11 @@ find /var/lib/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -p
 find /var/lib/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02700
 find /var/lib/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600
 
-find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor
-find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750
-find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600
+if [ -e /var/run/tor ]; then
+	find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor
+	find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750
+	find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600
+fi
 
 find /var/log/tor \( \( ! -user debian-tor \) -o \( ! -group adm \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:adm
 find /var/log/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750