diff --git a/debian/changelog b/debian/changelog
index 604c354..8cbf35a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-tempest-lib (0.7.0-1) experimental; urgency=medium
   * New upstream release.
   * Fixed (build-)depends for this release.
   * Removed debian/patches/os-testr-compat.patch applied upstream.
+  * Fixed watch file.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 29 Jul 2015 23:15:40 +0000
 
diff --git a/debian/watch b/debian/watch
index 8948fe3..735d5ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://pypi.python.org/packages/source/t/tempest-lib tempest-lib-(.*).tar.gz
-
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+https://github.com/openstack/tempest-lib/tags .*/(\d[\d\.]+)\.tar\.gz