diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index 8bf8b7902..159689dc2 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -304,6 +304,12 @@ krb5_init_context(krb5_context *context)
     cc_ops_register(p);
     kt_ops_register(p);
 
+#ifdef PKINIT
+    ret = hx509_context_init(&p->hx509ctx);
+    if (ret)
+	goto out;
+#endif	
+
 out:
     if(ret) {
 	krb5_free_context(p);