diff --git a/debian/changelog b/debian/changelog
index c1233e7..ef9c261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-pygit2 (0.22.0-2) unstable; urgency=medium
 
   * Removed broken unit tests (Closes: #786509).
+  * Fixed watch file.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 08 Jun 2015 14:48:00 +0200
 
diff --git a/debian/watch b/debian/watch
index 139a7ee..6e50fb0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-http://pypi.python.org/packages/source/p/pygit2/ pygit2-(.*).tar.gz
+opts="uversionmangle=s/\.(b|rc)/~$1/" \
+https://github.com/libgit2/pygit2/tags .*/v(\d[\d\.]+)\.tar\.gz