diff --git a/Makefile b/Makefile
index d00e3d0d27180a3d45f3498d4caa103bc2ff102e..1a600e6010205d4f56d171d127cb4c5fefb94a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -153,9 +153,10 @@ stamp/99: stamp/98 clone
 	./clone $< $@
 	touch $@
 
-stamp/final: stamp/99 untag
+stamp/final: stamp/99 untag renametag
 	./clone $< $@
 	./untag
+	./renametag
 	touch $@
 
 stamp/fromcvs-%: stamp/cvsroot-fixed cvs-branch
diff --git a/renametag b/renametag
new file mode 100755
index 0000000000000000000000000000000000000000..45e8a5fdd9a0a85e949e26494c24823fd31703aa
--- /dev/null
+++ b/renametag
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+cd final.git
+git tag -l |
+while read tag
+do
+    git tag `echo $tag|sed s/-/./g` $tag || exit 1
+    git tag -d $tag || exit 1
+done