diff --git a/configure.in b/configure.in
index 22b504482..758cc26ae 100644
--- a/configure.in
+++ b/configure.in
@@ -31,10 +31,6 @@ dnl
 AC_DEFINE([_GNU_SOURCE], 1,
 	[Define to enable extensions on glibc-based systems such as Linux.])
 
-if test -f $srcdir/lib/asn1/pkcs12.asn1 ; then
-	AC_DEFINE([PKINIT], 1, [Define to enable PKINIT.])
-fi
-
 AC_OBJEXT
 AC_EXEEXT
 
@@ -69,6 +65,13 @@ if test "$enable_hdb_openldap_module" = yes -a "$with_openldap" = yes; then
 fi
 AM_CONDITIONAL(OPENLDAP_MODULE, test "$enable_hdb_openldap_module" = yes -a "$with_openldap" = yes)
 
+AC_ARG_ENABLE(pk-init, 
+	AS_HELP_STRING([--enable-pk-init],
+		[if you want support to pk-init]))
+if test "$enable_pk_init" = yes ;then
+	AC_DEFINE([PKINIT], 1, [Define to enable PKINIT.])
+fi
+
 rk_TEST_PACKAGE(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4, krb4-config)
 
 LIB_kdb=