diff --git a/debian/watch b/debian/watch
index 58cd480..8925ad9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
-version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/golang-gopkg-eapache-queue.v1-$1\.tar\.gz/ \
-  https://github.com/eapache/queue/tags .*/?(\d\.\d.\d)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\
+      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/" \
+  https://github.com/eapache/queue/tags .*/v?(\d\S*)\.tar\.gz debian