diff --git a/debian/changelog b/debian/changelog
index 66875df..f5a79b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ postfwd (1.20-1) unstable; urgency=low
   * Add dpatch infrastructure
   * Provide update-alternatives for choosing the postfwd variant
   * Install also CHANGELOG2
+  * Bump Standards-Version to 3.9.1, no changes needed
 
  -- Jan Wagner <waja@cyconet.org>  Wed, 08 Dec 2010 22:04:01 +0100
 
diff --git a/debian/control b/debian/control
index e323c07..f340b80 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5), dpatch
 Homepage: http://www.postfwd.org/
 Vcs-Browser: https://scm.uncompleted.org/projects/debian/repository/show/postfwd
 Vcs-Svn: https://scm.uncompleted.org/svn/debian/postfwd/trunk
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 
 Package: postfwd
 Architecture: all
diff --git a/debian/postfwd.prerm b/debian/postfwd.prerm
index 8dcb8a2..66018fb 100644
--- a/debian/postfwd.prerm
+++ b/debian/postfwd.prerm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
 	update-alternatives --remove postfwd /usr/sbin/postfwd1
 	update-alternatives --remove postfwd /usr/sbin/postfwd2
diff --git a/debian/rules b/debian/rules
index 28ec61c..d61831f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ binary-indep: build install
 	dh_installinit -- defaults 19 21
 	dh_installman man/man8/postfwd2.8
 	dh_installman debian/tmp/postfwd1.8
-	# dh_link usr/share/man/man1/postfwd.1.gz usr/share/man/man1/postfwd2.1.gz
 	dh_compress
 	dh_fixperms
 	dh_perl