diff --git a/debian/watch b/debian/watch
index a0c602059630f959ae17900ab21ef62b7673895a..f369bc0290c3e2cdd2dea7571ecc449931d7ce0d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
-version=3
-opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://pypi.debian.net/diceware/diceware-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+version=4
+opts="filenamemangle=s%(?:.*?)?v?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE@-$1$2%" \
+      https://github.com/ulif/diceware/tags \
+      (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@