diff --git a/debian/watch b/debian/watch
index c09800b..bb0229d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-https://github.com/mobile-shell/mosh/tags .*/mosh-(\d[\d\.]+)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
+    https://github.com/mobile-shell/mosh/tags \
+    .*/mosh-(\d[\d\.]+)\.tar\.gz debian uupdate