diff --git a/debian/watch b/debian/watch
index 1bc6c80..faf6069 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-# Use uscan to check for newer upstream releases
 version=4
-opts="pgpsigurlmangle=s/$/.asc/" \
-   https://files.dyne.org/frei0r/releases/.*-([\d+\.a-z]+|\d+).tar.gz
+opts="filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/frei0r-$1\.tar\.gz/, \
+  dversionmangle=auto" \
+https://github.com/dyne/frei0r/tags .*/v?(\d[\d\.]+)\.tar\.gz