--- openldap-1.2.6.orig/libraries/liblber/Makefile.in
+++ openldap-1.2.6/libraries/liblber/Makefile.in
@@ -4,8 +4,8 @@
 ## LIBLBER
 ##
 
-LIBRARY = liblber.la
-XLIBRARY = ../liblber.a
+LIBRARY = liblber-openldap.la
+XLIBRARY = ../liblber-openldap.a
 
 SRCS= decode.c encode.c io.c bprint.c
 OBJS= decode.lo encode.lo io.lo bprint.lo
@@ -16,7 +16,7 @@
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries       
 
-XLIBS = -llber
+XLIBS = -llber-openldap
 XXLIBS = 
 
 dtest:    $(LIBRARY) dtest.o
--- openldap-1.2.6.orig/libraries/libldap/Makefile.in
+++ openldap-1.2.6/libraries/libldap/Makefile.in
@@ -3,8 +3,8 @@
 ##
 ## Makefile.in for LDAP -lldap
 ##
-LIBRARY = libldap.la
-XLIBRARY = ../libldap.a
+LIBRARY = libopenldap.la
+XLIBRARY = ../libopenldap.a
 PROGRAMS = ltest ttest
 
 SRCS	= bind.c open.c result.c error.c compare.c search.c \
@@ -25,7 +25,7 @@
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-XLIBS = -lldap -llber
+XLIBS = -lopenldap -llber-openldap
 XXLIBS = $(KRB_LIBS)
 
 ltest:	$(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
