diff --git a/debian/changelog b/debian/changelog
index 1f17f1d..f1b6345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+findbugs (3.0.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian/watch: Track the release tags on GitHub
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 10 Aug 2016 09:44:16 +0200
+
 findbugs (3.0.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/copyright b/debian/copyright
index 78c9237..bf1cfe3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: findbugs
-Source: http://findbugs.sourceforge.net/
+Source: https://github.com/findbugsproject/findbugs
 
 Files: src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java
 Copyright: 2010 Keith Lea
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 7faaa22..f810c8f 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,25 +1,20 @@
 #!/bin/sh -e
 
+PACKAGE=$(dpkg-parsechangelog -S Source)
 VERSION=$2
-DIR=findbugs-$VERSION
-TAR=findbugs_$VERSION.orig.tar.xz
+DIR=${PACKAGE}-${VERSION}
+TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
 
-# clean up the upstream tarball
-#unzip -x $3
-tar xzvf $3
-cd $DIR
-#Remove shipped jar + doc without sources
-rm -rf lib/*.jar lib/*.zip lib/*.txt
-rm -rf src/doc/pressRelease.pdf doc/pressRelease.pdf build-lib/
-cd ..
-tar Jcvf ../$TAR $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi
-
-exit 0
+mkdir $DIR.tmp $DIR
+tar -xf $3 --strip-components=1 -C $DIR.tmp
+mv $DIR.tmp/findbugs/* $DIR
+rm $3
+XZ_OPT=--best tar -c -v -J -f $TAR \
+    --exclude '*.jar' \
+    --exclude '*.pdf' \
+    --exclude '.settings' \
+    --exclude '.classpath' \
+    --exclude '.project' \
+    --exclude '.idea' \
+    $DIR
+rm -Rf $DIR.tmp $DIR
diff --git a/debian/watch b/debian/watch
index ca92410..baca0bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://sf.net/findbugs/findbugs-([\d\.]+)-source\.zip \
-debian debian/orig-tar.sh
+opts=uversionmangle=s/_preview/~preview/;s/_RC/~rc/ \
+https://github.com/findbugsproject/findbugs/tags .*/archive/([\d\.]+.*).tar.gz debian debian/orig-tar.sh