diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index c1d770bfe6..580b0af613 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -88,7 +88,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
 fi
 
 release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3 }' | sed "s/'//g"`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version-//"`
 echo "Version is $release_version / $revision"
 info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
@@ -131,11 +131,11 @@ fi
 # setup directory structure
 
 if [ -z "${BUILDTYPE}" ]; then
-	APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}
-	APP_VER_NAME=${APPNAME}-${release_version}_${revision}
+	APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}
+	APP_VER_NAME=${APPNAME}-${release_version}-${revision}
 else
-	APPDIR=${APPNAME}_${ARCH}-${release_version}_${revision}-${BUILDTYPE}
-	APP_VER_NAME=${APPNAME}-${release_version}_${revision}-${BUILDTYPE}
+	APPDIR=${APPNAME}_${ARCH}-${release_version}-${revision}-${BUILDTYPE}
+	APP_VER_NAME=${APPNAME}-${release_version}-${revision}-${BUILDTYPE}
 fi
 
 APPBIN=$APPDIR/bin
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 4862f285ab..fc8de3c5cf 100755
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -63,7 +63,7 @@ if [ x$DEBUG = xT ]; then
 fi
 
 release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version-//"`
 
 X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}"
 X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"