diff --git a/debian/changelog b/debian/changelog
index 18af43559b9a03ea4c32453af63bcf1d2299349c..459e7a44cd76b69bc62162a4404eacd9f3c7e401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+glance (2:17.0.0-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Updated watch file to get rid of 2011.2 upstream tag
+
+ -- Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>  Tue, 15 Jan 2019 12:06:27 +0100
+
 glance (2:17.0.0-4) unstable; urgency=medium
 
   * d/control:
diff --git a/debian/copyright b/debian/copyright
index d08dfc0ad9d7b919539213662fe89bf179a989ef..aa7baae3d6d8cb77d91ef420edf3ad667c95a26c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: glance
 Source: https://github.com/openstack/glance
+Files-Excluded: https://github.com/openstack/glance/archive/2011.2.tar.gz
 
 Files: *
 Copyright: (c) 2010-2011, US Government as represented by the Administrator of NASA
diff --git a/debian/watch b/debian/watch
index 77047f5a1497d3d06c3ae8c058e4f4d47e3e49ab..720872f2d0f3e4b74d3d0c6ddc442ed44c085ee3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.(b|rc)/~$1/" \
+opts=uversionmangle=s/2011.2/0.2011.2/;s/\.(b|rc)/~$1/ \
 https://github.com/openstack/glance/tags .*/(\d[\d\.]+)\.tar\.gz