diff --git a/deb/gen-deb-ver b/deb/gen-deb-ver
index e8b5424aaa..27728b37d0 100755
--- a/deb/gen-deb-ver
+++ b/deb/gen-deb-ver
@@ -24,19 +24,19 @@ gen_deb_version() {
 	increment="$3"
 	testVersion="${fullVersion#*-$pattern}"
 	baseVersion="${fullVersion%-"$pattern"*}"
-	echo "$baseVersion-$increment.$testVersion.$pattern$testVersion"
+	echo "$baseVersion-$increment.${testVersion##.}.$pattern$testVersion"
 }
 
 case "$debVersion" in
 	*-dev)
 		;;
-	*-tp[0-9]*)
+	*-tp[.0-9]*)
 		debVersion="$(gen_deb_version "$debVersion" tp 0)"
 		;;
-	*-beta[0-9]*)
+	*-beta[.0-9]*)
 		debVersion="$(gen_deb_version "$debVersion" beta 1)"
 		;;
-	*-rc[0-9]*)
+	*-rc[.0-9]*)
 		debVersion="$(gen_deb_version "$debVersion" rc 2)"
 		;;
 	*)
diff --git a/rpm/gen-rpm-ver b/rpm/gen-rpm-ver
index bd10abe83c..58e7146b9c 100755
--- a/rpm/gen-rpm-ver
+++ b/rpm/gen-rpm-ver
@@ -23,18 +23,18 @@ rpmRelease=3
 # Docker 18.01.0-ce-cs1-rc1: version=18.01.0.ce.cs1, release=0.1.rc1
 # Docker 18.01.0-ce-dev nightly: version=18.01.0.ce, release=0.0.YYYYMMDD.HHMMSS.gitHASH
 
-if [[ "$rpmVersion" =~ .*-tp[0-9]+$ ]]; then
-	tpVersion=${rpmVersion#*-tp}
+if [[ "$rpmVersion" =~ .*-tp[.0-9]+$ ]]; then
+	testVersion=${rpmVersion#*-tp}
 	rpmVersion=${rpmVersion%-tp*}
-	rpmRelease="0.${tpVersion}.tp${tpVersion}"
-elif [[ "$rpmVersion" =~ .*-beta[0-9]+$ ]]; then
-	betaVersion=${rpmVersion#*-beta}
+	rpmRelease="0.${testVersion##.}.tp${testVersion}"
+elif [[ "$rpmVersion" =~ .*-beta[.0-9]+$ ]]; then
+	testVersion=${rpmVersion#*-beta}
 	rpmVersion=${rpmVersion%-beta*}
-	rpmRelease="1.${betaVersion}.beta${betaVersion}"
-elif [[ "$rpmVersion" =~ .*-rc[0-9]+$ ]]; then
-	rcVersion=${rpmVersion#*-rc}
+	rpmRelease="1.${testVersion##.}.beta${testVersion}"
+elif [[ "$rpmVersion" =~ .*-rc[.0-9]+$ ]]; then
+	testVersion=${rpmVersion#*-rc}
 	rpmVersion=${rpmVersion%-rc*}
-	rpmRelease="2.${rcVersion}.rc${rcVersion}"
+	rpmRelease="2.${testVersion##.}.rc${testVersion}"
 fi
 
 DOCKER_GITCOMMIT=$($GIT_COMMAND rev-parse --short HEAD)