--- openldap-2.3.21/libraries/libldap_r/Makefile.in.orig	2006-04-20 12:12:17 +1100
+++ openldap-2.3.21/libraries/libldap_r/Makefile.in	2006-04-20 12:11:54 +1100
@@ -56,7 +56,7 @@
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(XXXLIBS)
 
 .links : Makefile
 	@for i in $(XXSRCS); do \
--- openldap-2.3.20/servers/slapd/Makefile.in.orig	2006-02-25 01:19:05 +1000
+++ openldap-2.3.20/servers/slapd/Makefile.in	2006-02-25 01:22:18 +1000
@@ -440,6 +440,6 @@
 	-$(MKDIR) $(DESTDIR)$(sbindir)
 	for i in $(SLAPTOOLS); do \
 		$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
-		$(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+		$(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
 	done
 
--- openldap-2.3.21/servers/slapd/slapi/Makefile.in.orig	2006-01-04 08:16:25 +1000
+++ openldap-2.3.21/servers/slapd/slapi/Makefile.in	2006-04-20 13:51:35 +1100
@@ -31,12 +31,13 @@
 
 XSRCS= version.c
 
-LDAP_INCDIR= ../../../include -I.. -I.       
-LDAP_LIBDIR= ../../../libraries       
+LDAP_INCDIR= ../../../include -I.. -I.
+LDAP_LIBDIR= ../../../libraries
 
 XLIBS = $(LIBRARY)
 XXLIBS = 
 NT_LINK_LIBS = $(AC_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
 
 XINCPATH = -I$(srcdir)/.. -I$(srcdir)
 XDEFS = $(MODULES_CPPFLAGS)