diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 24871bb57..f4a5a3a10 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-08  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_ldap.c: Include <lber.h> if we absolutely must.  This
+	helps when compiling against a very old OpenLDAP.
+
 2002-04-29  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_mailto.in: Properly handle key requests in full
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index bd08e7dba..0d85311c1 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -25,6 +25,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#ifdef NEED_LBER_H
+#include <lber.h>
+#endif
 #include <ldap.h>
 #include "keyserver.h"