diff --git a/Makefile b/Makefile
index c15d20dc9510ea9008036fb8c57f0de290f7e1dd..a336fa1e548cf3aa48933d817cf146029f00e72b 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ test-upgrade:
 	use_allegro () { li="${ALLEGRO} -q -L" ; ev="-e" ; } ; \
 	use_allegromodern () { li="${ALLEGROMODERN} -q -L" ; ev="-e" ; } ; \
 	su=test/script-support ; \
-	for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` ; do \
+	for tag in 1.37 1.97 1.369 `git tag -l '2.0??'` `git tag -l '2.??'` ; do \
 	  use_${lisp} ; \
 	  lo="(handler-bind ((warning #'muffle-warning)) (load \"tmp/asdf-$${tag}.lisp\"))" ; \
 	  echo "Testing upgrade from ASDF $${tag}" ; \
@@ -137,7 +137,7 @@ test-all: test-forward-references doc test-all-lisps
 # Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale,
 # as we currently build directly from upstream at git://common-lisp.net/projects/asdf/asdf.git
 debian-package: mrproper
-	: $${RELEASE:="$$(git tag -l '2.0[0-9][0-9]' | tail -n 1)"} ; \
+	: $${RELEASE:="$$(git tag -l '2.[0-9][0-9]' | tail -n 1)"} ; \
 	git-buildpackage --git-debian-branch=release --git-upstream-branch=$$RELEASE --git-tag --git-retag --git-ignore-branch
 
 # Replace SBCL's ASDF with the current one. -- Not recommended now that SBCL has ASDF2.
diff --git a/bin/asdf-version b/bin/asdf-version
index 4e9acfb5e9ebb91523008226a032ec13bbba91c5..ea68aed25d3833c0389e5d6d170956421b165a4c 100755
--- a/bin/asdf-version
+++ b/bin/asdf-version
@@ -3,7 +3,7 @@
 # write the highest tag to standard output
 # exit code is 1 if it cannot be found
 
-tag=`git describe --tags --match '[0-9].[0-9][0-9][0-9]'`
+tag=`git describe --tags --match '[0-9].[0-9][0-9]'`
 if [ "$tag" == "" ]; then
     exit 1
 fi
diff --git a/bin/make-tarball b/bin/make-tarball
index 4ec217e8bac2ead90e93d91d606ea4eca472abfb..5afa79fddbf9d08cf69e63e2a9e664bd9cce9802 100755
--- a/bin/make-tarball
+++ b/bin/make-tarball
@@ -4,7 +4,7 @@
 # annotated tag
 
 
-tag=`git describe --tags --match '[0-9].[0-9][0-9][0-9]'`
+tag=`git describe --tags --match '[0-9].[0-9][0-9]'`
 if [ "$tag" == "" ]; then
     echo "Unable to find most recent tag, exiting"
     exit 1
diff --git a/debian/README.building b/debian/README.building
index 265dc3109362fda583be8cf354d39ba2ba65fa12..0550f896c77e984fe6e141c7a109369d3a285dd1 100644
--- a/debian/README.building
+++ b/debian/README.building
@@ -10,7 +10,7 @@ As upstream maintainer, I do all development in master, and sometimes update rel
 	git merge master
 
 * Don't forget to renumber the version, if needed
-	./bin/bump-version.sh 2.0xx
+	./bin/bump-version.sh 2.xx
 
 * Commit any relevant files, if needed
 	git add ...
@@ -18,7 +18,7 @@ As upstream maintainer, I do all development in master, and sometimes update rel
 	git commit
 
 * do the releasing:
-	git tag 2.0xx ; make archive-copy ; make website ;
+	git tag 2.xx ; make archive-copy ; make website ;
         make push
 
 * edit debian files, then: