diff --git a/debian/watch b/debian/watch
index 3482cb73ad..cd322379e4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,5 @@
 version=3
 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
-filenamemangle=s/.*=v(.*)/gitlab-$1.tar.gz/ \
+filenamemangle=s/.*=v(.*)/gitlab-$1.tar.gz/,\
+dversionmangle=s/\+(debian|dfsg|ds|deb|gh)\d*$// \
 https://gitlab.com/gitlab-org/gitlab-ce/tags .*/archive.tar.gz\?ref=v(.*)
-#http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/gitlab-ce.git .*/gitlab-ce.git-(.*).tar.gz
-