diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index 71daaaf65..806bd3c36 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -2,12 +2,12 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-noinst_DATA = krb5.conf
+noinst_DATA = krb5.conf krb5-pkinit.conf
 
 check_PROGRAMS = ap-req
 check_SCRIPTS = $(SCRIPT_TESTS) 
 
-SCRIPT_TESTS = check-kdc check-digest
+SCRIPT_TESTS = check-kdc check-digest check-pkinit
 TESTS = $(SCRIPT_TESTS)
 
 do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
@@ -21,6 +21,11 @@ check-kdc: check-kdc.in Makefile
 	chmod +x check-kdc.tmp
 	mv check-kdc.tmp check-kdc
 
+check-pkinit: check-pkinit.in Makefile krb5-pkinit.conf
+	$(do_subst) < $(srcdir)/check-pkinit.in > check-pkinit.tmp
+	chmod +x check-pkinit.tmp
+	mv check-pkinit.tmp check-pkinit
+
 check-digest: check-digest.in Makefile
 	$(do_subst) < $(srcdir)/check-digest.in > check-digest.tmp
 	chmod +x check-digest.tmp
@@ -30,6 +35,11 @@ krb5.conf: krb5.conf.in Makefile
 	$(do_subst) < $(srcdir)/krb5.conf.in > krb5.conf.tmp
 	mv krb5.conf.tmp krb5.conf
 
+krb5-pkinit.conf: krb5-pkinit.conf.in Makefile
+	$(do_subst) < $(srcdir)/krb5-pkinit.conf.in > krb5-pkinit.conf.tmp
+	mv krb5-pkinit.conf.tmp krb5-pkinit.conf
+
+
 
 CLEANFILES= \
 	$(TESTS) \
@@ -38,11 +48,13 @@ CLEANFILES= \
 	cdigest-reply \
 	check-digest.tmp \
 	check-kdc.tmp \
+	check-pkinit.tmp \
 	client-cache \
 	current-db* \
 	digest-reply \
 	foopassword \
 	krb5.conf krb5.conf.tmp \
+	krb5-pkinit.conf krb5-pkinit.conf.tmp \
 	messages.log \
 	o2cache.krb5 \
 	o2digest-reply \
@@ -50,12 +62,19 @@ CLEANFILES= \
 	s2digest-reply \
 	sdigest-reply \
 	server.keytab \
+	req-pkinit.der \
+	req-kdc.der \
+	pkinit.crt \
+	kdc.crt \
+	ca.crt \
 	tempfile
 
 
 EXTRA_DIST = \
 	check-kdc.in \
+	check-pkinit.in \
 	check-digest.in \
 	krb5.conf.in \
+	krb5-pkinit.conf.in \
 	wait-kdc.sh \
 	pki-mapping