diff --git a/ChangeLog b/ChangeLog
index 0436c32f6..e09a6835b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20110904
  - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
    regress errors for the sandbox to warnings. ok tim dtucker
+ - (dtucker) [ssh-keygen.c ssh-pkcs11.c] Bug #1929: add null implementations
+   ofsh-pkcs11.cpkcs_init and pkcs_terminate for building without dlopen support.
 
 20110829
  - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 49e4eee10..4b6218b10 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -49,10 +49,7 @@
 #include "hostfile.h"
 #include "dns.h"
 #include "ssh2.h"
-
-#ifdef ENABLE_PKCS11
 #include "ssh-pkcs11.h"
-#endif
 
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS		2048
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 286c232c7..1f4c1c8e4 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -590,4 +590,18 @@ fail:
 	return (-1);
 }
 
+#else
+
+int
+pkcs11_init(int interactive)
+{
+	return (0);
+}
+
+void
+pkcs11_terminate(void)
+{
+	return;
+}
+
 #endif /* ENABLE_PKCS11 */