diff --git a/configure.ac b/configure.ac
index 1f44d836a..d17ba037f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,8 @@ lib/icinga/Makefile
 lib/db_ido/Makefile
 lib/python/Makefile
 pki/Makefile
+pki/icinga2-build-ca
+pki/icinga2-build-key
 test/Makefile
 third-party/Makefile
 third-party/cJSON/Makefile
diff --git a/icinga2.spec.in b/icinga2.spec.in
index f38cac29e..694c67cf6 100644
--- a/icinga2.spec.in
+++ b/icinga2.spec.in
@@ -232,7 +232,6 @@ fi
 %{_bindir}/icinga2-migrate-config
 %{_bindir}/icinga2-build-ca
 %{_bindir}/icinga2-build-key
-%{_bindir}/icinga2-pkifuncs
 %{_sbindir}/i2enfeature
 %{_sbindir}/i2disfeature
 %exclude %{_libdir}/%{name}/libdb_ido_mysql*
diff --git a/pki/Makefile.am b/pki/Makefile.am
index 7944df9b1..2e7a03ae7 100644
--- a/pki/Makefile.am
+++ b/pki/Makefile.am
@@ -1,6 +1,15 @@
 bin_SCRIPTS = \
 	icinga2-build-ca \
-	icinga2-build-key \
-	icinga2-pkifuncs
+	icinga2-build-key
 
-EXTRA_DIST = $(bin_SCRIPTS)
+icinga2pkidir = ${pkgdatadir}/pki
+icinga2pki_DATA = \
+	pkifuncs \
+	openssl.cnf
+
+CLEANFILES = $(bin_SCRIPTS)
+
+EXTRA_DIST = \
+	icinga2-build-ca.in \
+	icinga2-build-key.in \
+	$(icinga2pki_DATA)
diff --git a/pki/icinga2-build-ca b/pki/icinga2-build-ca.in
old mode 100755
new mode 100644
similarity index 74%
rename from pki/icinga2-build-ca
rename to pki/icinga2-build-ca.in
index ef7508afe..4b806c608
--- a/pki/icinga2-build-ca
+++ b/pki/icinga2-build-ca.in
@@ -1,5 +1,11 @@
 #!/bin/bash
-source $(dirname -- $0)/icinga2-pkifuncs
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+ICINGA2PKIDIR=$datadir/icinga2/pki
+
+source $ICINGA2PKIDIR/pkifuncs
 
 check_pki_dir
 
diff --git a/pki/icinga2-build-key b/pki/icinga2-build-key.in
old mode 100755
new mode 100644
similarity index 79%
rename from pki/icinga2-build-key
rename to pki/icinga2-build-key.in
index 4f0f3642a..5217451f2
--- a/pki/icinga2-build-key
+++ b/pki/icinga2-build-key.in
@@ -1,4 +1,12 @@
 #!/bin/sh
+prefix=@prefix@
+datarootdir=@datarootdir@
+datadir=@datadir@
+
+ICINGA2PKIDIR=$datadir/icinga2/pki
+
+source $ICINGA2PKIDIR/pkifuncs
+
 if [ -z "$1" ]; then
 	echo "Syntax: $0 <name>" >&2
 	exit 1
@@ -6,8 +14,6 @@ fi
 
 name=$1
 
-source $(dirname -- $0)/icinga2-pkifuncs
-
 check_pki_dir
 
 if [ ! -f $ICINGA_CA/ca.crt -o ! -f $ICINGA_CA/ca.key ]; then
diff --git a/pki/icinga2-pkifuncs b/pki/pkifuncs
similarity index 100%
rename from pki/icinga2-pkifuncs
rename to pki/pkifuncs