diff --git a/debian/release.sh b/debian/release.sh
index 509b47d8..675e0126 100755
--- a/debian/release.sh
+++ b/debian/release.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 error() {
 	echo "ERROR: $@"
@@ -8,18 +8,30 @@ error() {
 head -n1 debian/changelog | grep "unreleased" || error "This version must be 'unreleased'"
 
 i=1
+./debian/rules get-orig-source
+debuild
 sed -i "s/) unreleased;/-0ubuntu1~ppa1) hardy;/" debian/changelog
 debuild -S
 sed -i "s/ppa1) hardy;/ppa2) intrepid;/" debian/changelog
 debuild -S
 sed -i "s/ppa2) intrepid;/ppa3) jaunty;/" debian/changelog
 debuild -S
+sed -i "s/~ppa3) jaunty;/) jaunty;/" debian/changelog
+debuild -S
+ver=`head -n1 debian/changelog | sed "s/^.*(1.//" | sed "s/-.*$//"`
+ver=`expr $ver + 1`
+dch -v "1.$ver" "UNRELEASED"
+sed -i "s/1.$ver) jaunty;/1.$ver) unreleased;/" debian/changelog
 
 echo
 echo
+echo "To test:"
+echo "  sudo dpkg -i ../*.deb"
 echo
-echo "To upload:"
+echo "To upload PPA packages:"
 echo "  dput screen-profiles-ppa ../*ppa*changes"
 echo
+echo "To commit and push:"
+echo "  bzr commit && bzr push"
 echo
 echo