diff --git a/debian/changelog b/debian/changelog
index 2c6fe16..815e282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@
   * Standards-Version updated to 4.1.3
   * Update of Vcs-*
   * Update of the homepage
+  * Add a watch file
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 14 Jan 2018 19:03:49 +0100
 
diff --git a/debian/watch b/debian/watch
index 89132f8..b74a5ea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
-version=3
-http://sf.net/ohcount/ohcount-(\d+[0-9\-\.r]+)\.tar\.gz \
-debian debian/orig-tar.sh
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ohcount-$1.tar.gz%" \
+    https://github.com/blackducksoftware/ohcount/tags \
+    (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate