--- openldap-1.2.6.orig/clients/fax500/Makefile.in
+++ openldap-1.2.6/clients/fax500/Makefile.in
@@ -9,7 +9,7 @@
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldap -llber -llutil
+XLIBS =  -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 rp500 : rpversion.o
--- openldap-1.2.6.orig/clients/finger/Makefile.in
+++ openldap-1.2.6/clients/finger/Makefile.in
@@ -6,7 +6,7 @@
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldap -llber -llutil
+XLIBS =  -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 in.xfingerd : version.o
--- openldap-1.2.6.orig/clients/finger/main.c
+++ openldap-1.2.6/clients/finger/main.c
@@ -128,7 +128,7 @@
 
 	if ( dosyslog ) {
 #ifdef LOG_LOCAL4
-		openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
+		openlog( myname, OPENLOG_OPTIONS, LOG_DAEMON );
 #else
 		openlog( myname, OPENLOG_OPTIONS );
 #endif
--- openldap-1.2.6.orig/clients/gopher/Makefile.in
+++ openldap-1.2.6/clients/gopher/Makefile.in
@@ -11,7 +11,7 @@
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldap -llber -llutil
+XLIBS =  -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 go500 : goversion.o
--- openldap-1.2.6.orig/clients/gopher/go500.c
+++ openldap-1.2.6/clients/gopher/go500.c
@@ -175,7 +175,7 @@
 
 	if ( dosyslog ) {
 #ifdef LOG_LOCAL3
-		openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL3 );
+		openlog( myname, OPENLOG_OPTIONS, LOG_DAEMON );
 #else
 		openlog( myname, OPENLOG_OPTIONS );
 #endif
--- openldap-1.2.6.orig/clients/gopher/go500gw.c
+++ openldap-1.2.6/clients/gopher/go500gw.c
@@ -201,7 +201,7 @@
 
 	if ( dosyslog ) {
 #ifdef LOG_LOCAL3
-		openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL3 );
+		openlog( myname, OPENLOG_OPTIONS, LOG_DAEMON );
 #else
 		openlog( myname, OPENLOG_OPTIONS );
 #endif
--- openldap-1.2.6.orig/clients/mail500/Makefile.in
+++ openldap-1.2.6/clients/mail500/Makefile.in
@@ -7,7 +7,7 @@
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldap -llber -llutil
+XLIBS =  -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 mail500 : version.o
--- openldap-1.2.6.orig/clients/rcpt500/Makefile.in
+++ openldap-1.2.6/clients/rcpt500/Makefile.in
@@ -7,7 +7,7 @@
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldap -llber -llutil
+XLIBS =  -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 rcpt500 : version.o
--- openldap-1.2.6.orig/clients/tools/Makefile.in
+++ openldap-1.2.6/clients/tools/Makefile.in
@@ -7,7 +7,7 @@
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldif -lldap -llber -llutil
+XLIBS =  -lldif -lopenldap -llber-openldap -llutil
 XXLIBS	= $(KRB_LIBS) $(LUTIL_LIBS)
 
 XSRCS	= ldsversion.c ldmversion.c lddversion.c ldrversion.c
@@ -73,4 +73,4 @@
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(bindir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ldappasswd $(bindir)
 	$(RM) $(bindir)/ldapadd
-	$(LN) $(bindir)/ldapmodify $(bindir)/ldapadd
+	$(LN_S) ldapmodify $(bindir)/ldapadd
--- openldap-1.2.6.orig/clients/tools/ldapsearch.c
+++ openldap-1.2.6/clients/tools/ldapsearch.c
@@ -337,6 +337,11 @@
 	return rc; /* not reached */
 }
 
+#ifdef LINE_WIDTH
+#undef LINE_WIDTH
+#endif
+
+#define LINE_WIDTH 80
 
 static int dosearch(
 	LDAP	*ld,
--- openldap-1.2.6.orig/clients/ud/Makefile.in
+++ openldap-1.2.6/clients/ud/Makefile.in
@@ -9,7 +9,7 @@
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XLIBS =  -lldif -lldap -llber -llutil
+XLIBS =  -lldif -lopenldap -llber-openldap -llutil
 XXLIBS	= $(TERMCAP_LIBS) $(KRB_LIBS) $(LUTIL_LIBS)
 
 ud : version.o
