diff --git a/autofs.spec b/autofs.spec
index a090b76..d6c8487 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,7 +1,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 Version: 3.1.7
-Release: 33
+Release: 36
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -18,6 +18,7 @@ Patch7: autofs-3.1.5-hesiod-bind.patch
 Patch8: autofs-3.1.7-multiargs.patch
 Patch9: autofs-3.1.7-fpic.patch
 Patch10: autofs-3.1.7-schema.patch
+Patch11: autofs-3.1.7-usr.patch
 Buildroot: %{_tmppath}/%{name}-tmp
 BuildPrereq: hesiod-devel, openldap-devel, perl
 Prereq: /sbin/chkconfig
@@ -49,14 +50,15 @@ network, you should install autofs.
 %patch8 -p1 -b .multiargs
 %patch9 -p1 -b .fpic
 %patch10 -p1 -b .schema
+%patch11 -p1 -b .usr
 chmod u+w configure
 autoconf
 env LANG=C perl -pi -e 's|^CFLAGS    =.*|CFLAGS    = \$\(RPM_OPT_FLAGS\)|g' Makefile.rules
 
 %build
-%configure --with-hesiod --with-openldap=/usr
+%configure --with-hesiod --with-openldap=
 make STRIP=:
-%{__cc} -o autofs-ldap-auto-master $RPM_OPT_FLAGS %{SOURCE1} -lldap -llber
+%{__cc} -o autofs-ldap-auto-master $RPM_OPT_FLAGS %{SOURCE1} -lldap -llber -lresolv
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -124,6 +126,15 @@ fi
 #%dir /net
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 3.1.7-36
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 3.1.7-35
+- don't add the ldap library and include paths to the compiler flags
+
+* Wed Oct 30 2002 Nalin Dahyabhai <nalin@redhat.com> 3.1.7-34
+- link the ldap helper directly with libresolv
+
 * Tue Aug 27 2002 Nalin Dahyabhai <nalin@redhat.com> 3.1.7-33
 - rebuild