diff --git a/RELNOTES b/RELNOTES
index 0a8e70ee..70adf814 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -197,12 +197,16 @@ work on other platforms. Please report any problems and suggested fixes to
 				ip6-address, array of ip-address };
 	option 6rd 16 10 2001:: 1.2.3.4, 5.6.7.8;
 
-
 - Handle some DDNS corner cases better.  Maintain the DDNS transaction
   information when updating a lease and cancel any existing transactions
   when removing the ddns information.  
   [ISC-Bugs #23103]
 
+- Some fixes for LDAP
+  [ISC-Bugs #21783] - Include lber library when building ldap
+  [ISC-Bugs #22888] - Enable the ldap code when buidling common
+  The above fixes are from Jiri Popelka at Red Hat.
+
 			Changes since 4.2.0b2
 
 - Add declaration for variable in debug code in alloc.c.  [ISC-Bugs #21472]
diff --git a/common/Makefile.am b/common/Makefile.am
index a771df37..e4d4f9c8 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+AM_CFLAGS = $(LDAP_CFLAGS)
 
 noinst_LIBRARIES = libdhcp.a
 libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
diff --git a/configure.ac b/configure.ac
index 76616c06..391da15e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,6 +523,8 @@ AC_ARG_WITH(ldapcrypto,
 if test x$ldap = xyes || test x$ldapcrypto = xyes ; then
     AC_SEARCH_LIBS(ldap_initialize, [ldap], ,
 		   AC_MSG_FAILURE([*** Cannot find ldap_initialize with -lldap - do you need to install an OpenLDAP2 Devel package?]))
+    AC_SEARCH_LIBS(ber_pvt_opt_on, [lber], ,
+		   AC_MSG_FAILURE([*** Cannot find ber_pvt_opt_on with -llber - do you need to install an OpenLDAP2 Devel package?]))
 
     if test x$ldapcrypto = xyes ; then
 	AC_SUBST(LDAP_CFLAGS, ["-DLDAP_CONFIGURATION -DLDAP_USE_SSL"])