diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..0670125
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,3 @@
+The upstream source contains .hmm files with a non-free license. Use the
+get-orig-source target to repack the upstream source, removing the problematic
+HMMs in the process.
diff --git a/debian/rules b/debian/rules
index faf9ce6..7c42048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,22 +10,37 @@
 	dh $@ --parallel
 
 override_dh_auto_build:
-	mkdir db/free
-	debian/filter_hmms.lua 28S   < db/euk.hmm > db/free/euk.hmm
-	debian/filter_hmms.lua 23S   < db/arc.hmm > db/free/arc.hmm
-	debian/filter_hmms.lua 23S   < db/bac.hmm > db/free/bac.hmm
-	mkdir db/nonfree
-	debian/filter_hmms.lua 28S t < db/euk.hmm > db/nonfree/euk.hmm
-	debian/filter_hmms.lua 23S t < db/arc.hmm > db/nonfree/arc.hmm
-	debian/filter_hmms.lua 23S t < db/bac.hmm > db/nonfree/bac.hmm
+	# pass
 
 override_dh_auto_install:
 	# pass
 
 override_dh_auto_clean:
-	rm -rf db/free db/nonfree
+	rm -rf db/free
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz --destdir=..
-	mv ../barrnap_$(OVERSION).orig.tar.xz ../barrnap_$(VERSION).orig.tar.xz
-
+	unxz ../barrnap_$(OVERSION).orig.tar.xz
+	mkdir -p debian/repack-tmp
+	tar xf ../barrnap_$(OVERSION).orig.tar -C debian/repack-tmp
+	rm ../barrnap_$(OVERSION).orig.tar
+	mkdir -p debian/repack-tmp/barrnap-$(OVERSION)/db/free
+	debian/filter_hmms.lua 28S < \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/euk.hmm > \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/free/euk.hmm
+	debian/filter_hmms.lua 23S < \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/arc.hmm > \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/free/arc.hmm
+	debian/filter_hmms.lua 23S < \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/bac.hmm > \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/free/bac.hmm
+	mv debian/repack-tmp/barrnap-$(OVERSION)/db/free/euk.hmm \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/euk.hmm
+	mv debian/repack-tmp/barrnap-$(OVERSION)/db/free/bac.hmm \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/bac.hmm
+	mv debian/repack-tmp/barrnap-$(OVERSION)/db/free/arc.hmm \
+    debian/repack-tmp/barrnap-$(OVERSION)/db/arc.hmm
+	rm -rf debian/repack-tmp/barrnap-$(OVERSION)/db/free
+	tar cf ../barrnap_$(VERSION).orig.tar -C debian/repack-tmp barrnap-$(OVERSION)
+	xz ../barrnap_$(VERSION).orig.tar
+	rm -rf debian/repack-tmp