diff --git a/debian/changelog b/debian/changelog
index 39aa244..f112b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
 
   * Team upload.
   * Simplified the OS X and ASM patches
+  * Filter the upstream tarball with the Files-Excluded field in d/copyright
   * Standards-Version updated to 4.2.1
   * Use salsa.debian.org Vcs-* URLs
 
diff --git a/debian/copyright b/debian/copyright
index 6be71bf..8413165 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: lwjgl - Lightweight Java Game Library
 Upstream-Contact: LWJGL developers <info@lwjgl.org>
+Files-Excluded: *.class
+                *.jar
+                src/generated/*
+                src/native/generated/*
 
 Files: *
 Copyright: 2002-2015, Lightweight Java Game Library Project
diff --git a/debian/rules b/debian/rules
index 9b2ba05..b23c3f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-
-NAME    := $(shell dpkg-parsechangelog| sed -n '/^Source/{s/Source: \(.*\)/\1/p}')
-VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
-TMPDIR  := $(NAME)-$(VERSION)
-TAR     := ../$(NAME)_$(VERSION).orig.tar.gz
-TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-$(DEB_HOST_ARCH)
@@ -26,23 +20,9 @@
 	ant javadoc
 
 override_dh_auto_install:
-	jh_installjavadoc -plib$(NAME)-java-doc doc/javadoc
+	jh_installjavadoc -pliblwjgl-java-doc doc/javadoc
 
 override_dh_auto_clean:
 	find src/native/ -name '*org_lwjgl_*.h' -delete
 	rm -rf src/native/generated src/generated doc bin libs dist res temp
 	jh_clean
-
-get-orig-source:
-	rm -f $(TAR)
-	uscan --verbose --download-version $(VERSION) \
-		--force-download --repack --no-symlink --rename
-	mkdir $(TMPDIR) && tar -C $(TMPDIR) -zxf $(TAR) && rm $(TAR)
-	cd $(TMPDIR) && find . -type f -exec fromdos {} \;
-	echo "The following files will not be included in Debian tarball:"
-	cd $(TMPDIR) && find . \( -name '*.class' -o -name '*.jar' \
-		-o -path './src/generated/*' -o -path './src/native/generated/*' \) \
-		-print -delete
-	ZIP=--best tar --exclude-vcs --exclude src/generated \
-		--exclude src/native/generated -zcf $(TARDFSG) $(TMPDIR)
-	rm -rf $(TMPDIR)
diff --git a/debian/watch b/debian/watch
index b090136..21ac70f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="dversionmangle=s/\+dfsg//" \
+opts="repack,compression=xz,dversionmangle=s/\+dfsg//" \
 http://sf.net/java-game-lib/lwjgl-source-(\d.*).zip