diff --git a/debian/copyright b/debian/copyright
index c9aa948424..3d1ff8dacd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gitlab-ce
 Source: https://gitlab.com/gitlab-org/gitlab-ce
+Files-Excluded:
+    vendor/assets/javascripts/clipboard.js
+    vendor/assets/javascripts/jquery.cookie.js
+    vendor/assets/javascripts/vue-resource.min.js
+    vendor/assets/javascripts/vue.min.js
 
 Files: *
 Copyright: 2011-2015 GitLab B.V.
diff --git a/debian/watch b/debian/watch
index 26ad56cf37..5783867fcb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,8 @@
 version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
+opts=\
+repacksuffix=+dfsg1,\
+repack,compression=xz,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,\
 filenamemangle=s/.*=v(.*)/gitlab-$1.tar.gz/,\
-dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)(\~)*(rc)*(\d)*$/$1$3$4$5/ \
+dversionmangle=s/(\d)[\+]?(debian|dfsg|ds|deb|gh)\d*(\~)*(rc)*(\d)*$/$1$3$4$5/ \
 https://gitlab.com/gitlab-org/gitlab-ce/tags .*/archive.tar.gz\?ref=v(.*)