diff --git a/debian/changelog b/debian/changelog
index c025234..b3f03e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-isync (0.9.2-1) unstable; urgency=low
+isync (0.9.2+cvsXXXXXXXX-1) unstable; urgency=low
 
   * New upstream release.
        - Password prompt now includes the mailbox/server (Closes: #92893)
diff --git a/debian/generate-deb b/debian/generate-deb
index a7bcc95..add959b 100755
--- a/debian/generate-deb
+++ b/debian/generate-deb
@@ -3,16 +3,26 @@
 # Intended to be run from the root of the isync source tree in the repository.
 #
 VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]\+$/\1/p'`
+OLDVERSION=$VERSION
 
-if [ ! -f ../isync_$VERSION.orig.tar.gz ]; then
-	echo isync_$VERSION.orig.tar.gz must be found in the parent directory.
-	exit 1
+if echo $VERSION | grep +cvsXXXXXXXX; then
+	DATE=`date +%Y%m%d`
+	VERSION=`echo $VERSION | sed -e s/+cvsXXXXXXXX/+cvs${DATE}/`
+else
+	if [ ! -f ../isync_$VERSION.orig.tar.gz ]; then
+		echo isync_$VERSION.orig.tar.gz must be found in the parent directory.
+		exit 1
+	fi
 fi
 rm -rf ../isync-$VERSION
 
 fakeroot ./debian/rules clean
 cp -rl . ../isync-$VERSION
 cd ../isync-$VERSION
+if [ "$OLDVERSION" != "$VERSION" ]; then
+	sed -e s/+cvsXXXXXXXX/+cvs${DATE}/ < debian/changelog > debian/changelog.new
+	mv debian/changelog.new debian/changelog
+fi 
 find . -name CVS -print0 | xargs -0r rm -rf
 find . -name .cvsignore -print0 | xargs -0r rm
 find . -type l -print0 | xargs -0r rm