diff --git a/debian/watch b/debian/watch
index 4ce2b82e24..3482cb73ad 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,6 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/gitlab-ce.git .*/gitlab-ce.git-(.*).tar.gz
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
+filenamemangle=s/.*=v(.*)/gitlab-$1.tar.gz/ \
+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
+