diff --git a/Makefile b/Makefile
index dc60103..74e7bc6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.2~rc1
+VERSION     = 4.2rc1
+DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 
 
@@ -230,8 +231,8 @@ release: tidy fixup-perms update-version update-modules clean changelog
 #  Make a new orig.tar.gz for the Debian package
 #
 orig-tar-gz: release
-	mv $(BASE)-$(VERSION).tar.gz ../$(BASE)_$(VERSION).orig.tar.gz
-	mv $(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(VERSION).orig.tar.gz.asc
+	mv $(BASE)-$(VERSION).tar.gz ../$(BASE)_$(DEBVERSION).orig.tar.gz
+	mv $(BASE)-$(VERSION).tar.gz.asc ../$(BASE)_$(DEBVERSION).orig.tar.gz.asc
 
 
 #
@@ -254,7 +255,7 @@ test-verbose:
 #
 tidy:
 	if [ -x /usr/bin/perltidy ]; then \
-	for i in bin/*-*; do \
+	for i in bin/*-*[^~]; do \
 		echo "tidying $$i"; \
 		perltidy  $$i \
 	; done \
@@ -307,4 +308,4 @@ update-modules:
 # at the top of this file.  Steve-Specific?
 #
 update-version:
-	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9]';/RELEASE = '${VERSION}';/g" bin/*-*
+	perl -pi.bak -e "s/RELEASE = '[0-9]\.[0-9][^']*';/RELEASE = '${VERSION}';/g" bin/*-*[^~]
diff --git a/bin/xen-create-image b/bin/xen-create-image
index 660f495..bf4c425 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -665,7 +665,7 @@ my $FAIL = 0;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xen-create-nfs b/bin/xen-create-nfs
index 8837bd9..6b26e2e 100755
--- a/bin/xen-create-nfs
+++ b/bin/xen-create-nfs
@@ -130,7 +130,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 # store version number away.
diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index b02544e..c153869 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -169,7 +169,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xen-list-images b/bin/xen-list-images
index 241180a..802d778 100755
--- a/bin/xen-list-images
+++ b/bin/xen-list-images
@@ -102,7 +102,7 @@ $CONFIG{ 'prefix' } = "/etc/xen";
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xen-resize-guest b/bin/xen-resize-guest
index 2917582..0c9192a 100755
--- a/bin/xen-resize-guest
+++ b/bin/xen-resize-guest
@@ -116,7 +116,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xen-update-image b/bin/xen-update-image
index 13a387a..6cbef5b 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -120,7 +120,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 #
diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index d7d7445..d655f12 100755
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -156,7 +156,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xt-customize-image b/bin/xt-customize-image
index b8a1000..573fef6 100755
--- a/bin/xt-customize-image
+++ b/bin/xt-customize-image
@@ -97,7 +97,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 
diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index 692c03e..f1f7551 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -73,7 +73,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 # Init
 my $mirror = '';
diff --git a/bin/xt-install-image b/bin/xt-install-image
index 065d392..f1918f2 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.2~rc1';
+my $RELEASE = '4.2rc1';
 
 
 #