diff --git a/debian/watch b/debian/watch
index 5f792e5..a7b9153 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,8 @@
-# run "uscan --report" to check or "gpb import-orig --uscan" to update
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
- https://github.com/sugarlabs/write-activity/tags \
- (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian
+# check: uscan --report
+# update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan
+
+opts=\
+filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-$1/ \
+https://github.com/sugarlabs/write-activity/tags \
+.*?@ANY_VERSION@@ARCHIVE_EXT@