diff --git a/build/top.mk b/build/top.mk
index 4cec1aed3001cef7a0698651200edfdb5c5ed54b..f912b9a8c613dba76827df73def94a1783bd331a 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -91,7 +91,7 @@ LTFLAGS_MOD = $(@PLAT@_LTFLAGS_MOD)
 LINK_LIBS = $(@PLAT@_LINK_LIBS)
 
 LTLINK   = $(LIBTOOL) --mode=link \
-	$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS)
+	$(CC) $(LT_CFLAGS) -static $(LDFLAGS) $(LTFLAGS)
 
 LTCOMPILE_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=compile \
 	$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
@@ -140,7 +140,7 @@ MANCOMPRESSSUFFIX=
 INCLUDEDIR= $(top_srcdir)/include
 LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBADIR= $(top_builddir)/libraries
-LDAP_LIBPATH= -L$(LDAP_LIBADIR)
+LDAP_LIBPATH= -L$(LDAP_LIBADIR)/libldap -L$(LDAP_LIBADIR)/liblber -L$(LDAP_LIBADIR)
 
 LUTIL_LIBS = @LUTIL_LIBS@
 LDIF_LIBS = @LDIF_LIBS@