diff --git a/debian/barrnap-silva-hmms.install b/debian/barrnap-silva-hmms.install
new file mode 100644
index 0000000..6ff5727
--- /dev/null
+++ b/debian/barrnap-silva-hmms.install
@@ -0,0 +1,3 @@
+db/nonfree/euk.hmm usr/share/barrnap/db/nonfree
+db/nonfree/arc.hmm usr/share/barrnap/db/nonfree
+db/nonfree/bac.hmm usr/share/barrnap/db/nonfree
diff --git a/debian/barrnap.install b/debian/barrnap.install
index bf3bf42..d98c4f5 100644
--- a/debian/barrnap.install
+++ b/debian/barrnap.install
@@ -1,2 +1,4 @@
 bin/barrnap usr/bin
-db usr/share/barrnap
+db/free/euk.hmm usr/share/barrnap/db
+db/free/arc.hmm usr/share/barrnap/db
+db/free/bac.hmm usr/share/barrnap/db
diff --git a/debian/control b/debian/control
index 8c20a5b..6a55eee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,8 @@
 Source: barrnap
-Section: non-free/science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Sascha Steinbiss <sascha@steinbiss.name>
-Build-Depends: debhelper (>= 9.0.0), hmmer (>= 3.1)
+Build-Depends: debhelper (>= 9.0.0), hmmer (>= 3.1), lua5.1, dh-exec
 Standards-Version: 3.9.6
 Homepage: http://www.vicbioinformatics.com/software.barrnap.shtml
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/barrnap/trunk/
@@ -11,6 +10,7 @@
 
 Package: barrnap
 Architecture: all
+Section: science
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, hmmer (>= 3.1)
 Description: rapid ribosomal RNA prediction
  Barrnap (BAsic Rapid Ribosomal RNA Predictor) predicts the location of
@@ -21,3 +21,11 @@
  NHMMER tool that comes with HMMER 3.1 for HMM searching in RNA:DNA style.
  Multithreading is supported and one can expect roughly linear speed-ups
  with more CPUs.
+
+Package: barrnap-silva-hmms
+Architecture: any
+Section: non-free/science
+Depends: barrnap
+Description: non-free pHMMs for barrnap
+ Profile Hidden Markov models (pHMMs) for use with Barrnap (BAsic Rapid
+ Ribosomal RNA Predictor), which are only free to use for academic users.
diff --git a/debian/filter_hmms.lua b/debian/filter_hmms.lua
new file mode 100755
index 0000000..f000948
--- /dev/null
+++ b/debian/filter_hmms.lua
@@ -0,0 +1,35 @@
+#!/usr/bin/env lua
+
+function usage()
+  io.stderr:write(string.format("Usage: %s <filter> [<invert>] < file\n", arg[0]))
+  io.stderr:write('Filters out a HMM with NAME matching <filter>.\n')
+  os.exit(1)
+end
+
+if #arg < 1 then
+  usage()
+end
+
+lastname = nil
+lines = {}
+for l in io.lines() do
+  name = l:match('NAME%s+(.*)')
+  table.insert(lines, l)
+  if name then
+    lastname = name
+  elseif l:match('//') then
+    if arg[2] then
+      if lastname:match(arg[1]) then
+        print(table.concat(lines, '\n'))
+      end
+    else
+      if not lastname:match(arg[1]) then
+        print(table.concat(lines, '\n'))
+      end
+    end
+    lines = {}
+  end
+end
+
+
+
diff --git a/debian/rules b/debian/rules
index 0e3f682..faf9ce6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,22 @@
 	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
+
+override_dh_auto_install:
 	# pass
 
-override_dh_auto_install:
-	# pass 
+override_dh_auto_clean:
+	rm -rf db/free db/nonfree
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz --destdir=..
-	mv ../barrnap_$(OVERSION).orig.tar.xz ../barrnap_$(VERSION).orig.tar.xz 
+	mv ../barrnap_$(OVERSION).orig.tar.xz ../barrnap_$(VERSION).orig.tar.xz