diff --git a/authconfig-5.3.13-nssldap-path.patch b/authconfig-5.3.13-nssldap-path.patch
new file mode 100644
index 0000000..231e0d3
--- /dev/null
+++ b/authconfig-5.3.13-nssldap-path.patch
@@ -0,0 +1,11 @@
+--- authconfig-5.3.13/authinfo.py.nssldap-path	2006-12-12 21:13:51.000000000 +0100
++++ authconfig-5.3.13/authinfo.py	2007-03-19 20:27:39.000000000 +0100
+@@ -69,7 +69,7 @@
+ PATH_SCSETUP = "/usr/bin/pkcs11_setup"
+ 
+ PATH_LIBNSS_DB = LIBDIR + "/libnss_db.so.2"
+-PATH_LIBNSS_LDAP = LIBDIR + "/libnss_ldap.so.2"
++PATH_LIBNSS_LDAP = "/usr" + LIBDIR + "/libnss_ldap.so.2"
+ PATH_LIBNSS_NIS = LIBDIR + "/libnss_nis.so.2"
+ PATH_LIBNSS_HESIOD = LIBDIR + "/libnss_hesiod.so.2"
+ PATH_LIBNSS_ODBCBIND = LIBDIR + "/libnss_odbcbind.so.2"
diff --git a/authconfig.spec b/authconfig.spec
index a990eec..197b1f7 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -3,7 +3,7 @@ Name: authconfig
 Version: 5.3.13
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -12,9 +12,12 @@ Source: %{name}-%{version}.tar.bz2
 Requires: rhpl, newt, pam >= 0.99.6.2, usermode
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]" || echo 2.3)
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
+Conflicts: nss_ldap < 254
 BuildRequires: glib2-devel, python, python-devel
 BuildRequires: desktop-file-utils, intltool, gettext, perl-XML-Parser
 
+Patch1: authconfig-5.3.13-nssldap-path.patch
+
 %description 
 Authconfig is a command line utility which can configure a workstation
 to use shadow (more secure) passwords.  Authconfig can also configure a
@@ -35,6 +38,7 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .nssldap-path
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -95,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Mar 19 2007 Tomas Mraz <tmraz@redhat.com> - 5.3.13-2
+- nss_ldap is now in /usr/lib (#232975)
+
 * Tue Dec 12 2006 Tomas Mraz <tmraz@redhat.com> - 5.3.13-1
 - another traceback in --probe and other fixes (#218874)
 - make smbRealm a default realm when appropriate (#219300)