diff --git a/pkg/Makefile b/pkg/Makefile
index 28e5964ff..41c4796ef 100644
--- a/pkg/Makefile
+++ b/pkg/Makefile
@@ -1,20 +1,23 @@
 all:
 
 install:
+	# main pkg(8) glue
 	@cp ${.CURDIR}/+PRE_DEINSTALL ${DESTDIR}
 	@cp ${.CURDIR}/+POST_INSTALL ${DESTDIR}
 	@cp ${.CURDIR}/+MANIFEST ${DESTDIR}
+	# config.xml factory reset file
+	@cp ${.CURDIR}/config.xml.sample ${DESTDIR}/usr/local/etc
+	@echo "@sample /usr/local/etc/config.xml.sample"
+	# main package repository configuration
 	@mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos
 	@cp ${.CURDIR}/origin.conf.sample ${DESTDIR}/usr/local/etc/pkg/repos
 	@echo "@sample /usr/local/etc/pkg/repos/origin.conf.sample"
+	# available fingerprints
+	@cp -r ${.CURDIR}/fingerprints ${DESTDIR}/usr/local/etc/pkg/
+	@(cd ${.CURDIR}/fingerprints; find * -type f) | \
+	    xargs -n1 printf "/usr/local/etc/pkg/fingerprints/%s\n"
+	# XXX CONSERVATIVE_UPGRADE is not very helpful
 	@cp ${.CURDIR}/pkg.conf ${DESTDIR}/usr/local/etc
 	@echo /usr/local/etc/pkg.conf
-	@cp ${.CURDIR}/config.xml.sample ${DESTDIR}/usr/local/etc
-	@echo "@sample /usr/local/etc/config.xml.sample"
-	# XXX needs generic approach to allow custom fingerprints
-	@mkdir -p ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted
-	@cp ${.CURDIR}/trusted/pkg.opnsense.org.20150402 \
-	    ${DESTDIR}/usr/local/etc/pkg/fingerprints/OPNsense/trusted
-	@echo /usr/local/etc/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20150402
 
 .PHONY: install
diff --git a/pkg/trusted/pkg.opnsense.org.20150402 b/pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20150402
similarity index 100%
rename from pkg/trusted/pkg.opnsense.org.20150402
rename to pkg/fingerprints/OPNsense/trusted/pkg.opnsense.org.20150402