diff --git a/Makefile b/Makefile
index 283fcd8..1a62857 100644
--- a/Makefile
+++ b/Makefile
@@ -27,15 +27,15 @@ make-Certificate-Authority-Certificate-file:
 		--outfile certificate_authority_certificate.pem
 
 create:
-	mkdir -p debian/files/etc/pki/CA/
 	mkdir -p debian/DEBIAN
 	cp control debian/DEBIAN/
 	echo "Version: 0."$(STAMP) >> debian/DEBIAN/control
 	echo "2.0" > debian/debian-binary
-	cp certificate_authority_key.pem debian/files/etc/pki/CA/cacert.pem
-	cp farm/*server_key.pem debian/files/etc/pki/CA/
+	mkdir -p debian/files/etc/pki/CA/
+	cp *.pem debian/files/etc/pki/CA/
+	cp farm/*.pem debian/files/etc/pki/CA/
 	chmod 444 debian/files/etc/pki/CA/*.pem
-	cd debian/files/ && md5sum etc/pki/CA/cacert.pem > ../DEBIAN/md5sum
+	cd debian/files/ && md5sum etc/pki/CA/*.pem > ../DEBIAN/md5sum
 	cd debian/DEBIAN && tar --ignore-failed-read -cvJf ../control.tar.xz {post,pre}{inst,rm} md5sums control
 	cd debian/files && tar -cvJf ../data.tar.xz .
 	cd debian && ar rcs ../wit-libvirt-tls-cert.$(STAMP).deb debian-binary control.tar.xz data.tar.xz