diff --git a/.cvsignore b/.cvsignore
index 23c3f92..820800a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 dhcp-4.1.1.tar.gz
-ldap-for-dhcp-4.1.1-1.tar.gz
+ldap-for-dhcp-4.1.1-2.tar.gz
diff --git a/dhcp-4.1.1-implicit-DSO-linking.patch b/dhcp-4.1.1-implicit-DSO-linking.patch
deleted file mode 100644
index 6cb9c18..0000000
--- a/dhcp-4.1.1-implicit-DSO-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dhcp-4.1.1/configure.ac.DSO dhcp-4.1.1/configure.ac
---- dhcp-4.1.1/configure.ac.DSO	2010-02-16 11:52:30.000000000 +0100
-+++ dhcp-4.1.1/configure.ac	2010-02-16 11:52:55.000000000 +0100
-@@ -548,7 +548,7 @@ AC_ARG_WITH(ldap,
-     [ldap=no])
- if test x$ldap = xyes ; then
-     AM_CHECK_LDAP
--    ldap_libs="-lldap"
-+    ldap_libs="-lldap -llber"
-     AC_SUBST(LDAP_CFLAGS, [-DLDAP_CONFIGURATION])
-     AC_SUBST(LDAP_LIBS, [$ldap_libs])
- fi
diff --git a/dhcp.spec b/dhcp.spec
index b2537ca..c5d31cd 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -8,12 +8,12 @@
 %global basever 4.1.1
 
 # LDAP patch version
-%global ldappatchver %{basever}-1
+%global ldappatchver %{basever}-2
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}
-Release:  6%{?dist}
+Release:  7%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -208,9 +208,6 @@ libdhcpctl and libomapi static libraries are also included in this package.
 # with multiple dhclients running easier (#546792)
 %patch21 -p1 -b .logpid
 
-# implicit DSO linking (remove this patch when upstream fix this in ldap-for-dhcp)
-%patch22 -p1 -b .DSO
-
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -504,6 +501,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Feb 16 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-7
+- ldap-for-dhcp-4.1.1-2 (#564810)
+
 * Tue Feb 16 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-6
 - Fix ldap patch to explicitly link with liblber (#564810)
 
diff --git a/sources b/sources
index 4d4f711..9fd909c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 38a74c89d8913b9b5f33737047623c18  dhcp-4.1.1.tar.gz
-1a99ffb11c00a603ce2146f7d13ab967  ldap-for-dhcp-4.1.1-1.tar.gz
+9fa2f64826c969a55fd28263e4b6cad6  ldap-for-dhcp-4.1.1-2.tar.gz