diff --git a/tools/rpi-create-tags b/tools/rpi-create-tags
new file mode 100755
index 0000000..ded302c
--- /dev/null
+++ b/tools/rpi-create-tags
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Create git tags that match the APT releases
+
+git blame debian/changelog | egrep "rpiboot .*urgency=" | sed 's/[()]//g' | sed 's/~/-/g' | awk '{print "git tag " $9 " " $1}'