diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index c7a6a97e74..5ae45de007 100644
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -55,7 +55,7 @@ LIB_DEFS = -DLDAP_LIBRARY
 XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_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) $(LTHREAD_LIBS)
 
 apitest:	$(XLIBS) apitest.o
 	$(LTLINK) -o $@ apitest.o $(LIBS)
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 4529469db4..bbef24a62f 100644
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -26,8 +26,7 @@ LDAP_LIBDIR= ../../libraries
 
 XLIBS    = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
 XXLIBS	 = $(SECURITY_LIBS) $(LUTIL_LIBS)
-RLIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
-
+XXXLIBS  = $(LTHREAD_LIBS)
 
 OBJS     = slapd-common.o
 
@@ -61,5 +60,5 @@ ldif-filter: ldif-filter.o $(XLIBS)
 	$(LTLINK) -o $@ ldif-filter.o $(LIBS)
 
 slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS)
-	$(LTLINK) -o $@ slapd-mtread.o $(OBJS) $(RLIBS)
+	$(LTLINK) -o $@ slapd-mtread.o $(OBJS) $(LIBS)