diff --git a/Makefile b/Makefile
index 6dd2b743b..66f1819ad 100644
--- a/Makefile
+++ b/Makefile
@@ -239,6 +239,9 @@ release:
 	@echo "Test README"
 	python3 setup.py check -r -s
 
+# XXX make branch, based on a ticket (provided how?)
+# XXX or, specify that "make release" must run on such a branch "XXXX.tahoe-release"
+
 	@echo "Update NEWS"
 	python3 -m towncrier build --yes --version `python3 misc/build_helpers/update-version.py --no-tag`
 	git add -u
@@ -249,22 +252,22 @@ release:
 
 	@echo "Build and sign wheel"
 	python3 setup.py bdist_wheel
-	gpg --pinentry=loopback -u meejah@meejah.ca --armor --detach-sign dist/tahoe_lafs-`git describe --abbrev=0`-py3-none-any.whl
-	ls dist/*`git describe --abbrev=0`*
+	gpg --pinentry=loopback -u meejah@meejah.ca --armor --detach-sign dist/tahoe_lafs-`git describe | cut -b 12-`-py3-none-any.whl
+	ls dist/*`git describe | cut -b 12-`*
 
 	@echo "Build and sign source-dist"
 	python3 setup.py sdist
-	gpg --pinentry=loopback -u meejah@meejah.ca --armor --detach-sign dist/tahoe-lafs-`git describe --abbrev=0`.tar.gz
-	ls dist/*`git describe --abbrev=0`*
+	gpg --pinentry=loopback -u meejah@meejah.ca --armor --detach-sign dist/tahoe-lafs-`git describe | cut -b 12-`.tar.gz
+	ls dist/*`git describe | cut -b 12-`*
 
 release-test:
-	gpg --verify dist/tahoe-lafs-`git describe --abbrev=0`.tar.gz.asc
-	gpg --verify dist/tahoe_lafs-`git describe --abbrev=0`-py3-none-any.whl.asc
+	gpg --verify dist/tahoe-lafs-`git describe | cut -b 12-`.tar.gz.asc
+	gpg --verify dist/tahoe_lafs-`git describe | cut -b 12-`-py3-none-any.whl.asc
 	virtualenv testmf_venv
-	testmf_venv/bin/pip install dist/tahoe_lafs-`git describe --abbrev=0`-py3-none-any.whl
+	testmf_venv/bin/pip install dist/tahoe_lafs-`git describe | cut -b 12-`-py3-none-any.whl
 	testmf_venv/bin/tahoe-lafs --version
 # ... 
 	rm -rf testmf_venv
 
 release-upload:
-	twine upload dist/tahoe_lafs-`git describe --abbrev=0`-py3-none-any.whl dist/tahoe_lafs-`git describe --abbrev=0`-py3-none-any.whl.asc dist/tahoe-lafs-`git describe --abbrev=0`.tar.gz dist/tahoe-lafs-`git describe --abbrev=0`.tar.gz.asc
+	twine upload dist/tahoe_lafs-`git describe | cut -b 12-`-py3-none-any.whl dist/tahoe_lafs-`git describe | cut -b 12-`-py3-none-any.whl.asc dist/tahoe-lafs-`git describe | cut -b 12-`.tar.gz dist/tahoe-lafs-`git describe | cut -b 12-`.tar.gz.asc