diff --git a/.gitignore b/.gitignore
index 5edc0d4..88224ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@ _build
 lql-api
 .pc
 
+debian/files
 debian/debhelper-build-stamp
+debian/lql-api.substvars
 debian/lql-api.debhelper.log
-debian/lql-api
 debian/.debhelper
diff --git a/debian/watch b/debian/watch
index d997ccc..6a027a6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,11 +1,4 @@
 version=4
-opts="mode=git, pgpmode=none" \
-  https://github.com/webmeisterei/lql-api.git \
-  HEAD debian
-
-# Use the following when upstream starts to tag releases:
-#
-#version=4
-#opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%lql-api-$1.tar.gz%,\
-#      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/" \
-#  https://github.com/webmeisterei/lql-api/tags .*/v?(\d\S*)\.tar\.gz debian
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%lql-api-$1.tar.gz%,\
+      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/" \
+      https://github.com/webmeisterei/lql-api/tags .*/v?(\d\S*)\.tar\.gz debian