diff --git a/apr/Makefile.in b/apr/Makefile.in
index fe6ad50..baec02e 100644
--- a/apr/Makefile.in
+++ b/apr/Makefile.in
@@ -79,8 +79,10 @@ install: $(TARGET_LIB) apr-config.out bu
 	for f in libtool shlibtool; do \
 	    if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \
 	done
-	$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir)
-	for f in make_exports.awk make_var_export.awk; do \
+	for f in config.guess config.sub install.sh mkdir.sh gen-build.py get-version.sh; do \
+	    $(INSTALL) -m 755 $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
+	done
+	for f in make_exports.awk make_var_export.awk apr_common.m4 find_apr.m4; do \
 	    $(INSTALL_DATA) $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
 	done
 	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
diff --git a/apr/apr-config.in b/apr/apr-config.in
index e0500ed..d299869 100644
--- a/apr/apr-config.in
+++ b/apr/apr-config.in
@@ -35,7 +35,7 @@ SHELL="@SHELL@"
 CPPFLAGS="@EXTRA_CPPFLAGS@"
 CFLAGS="@EXTRA_CFLAGS@"
 LDFLAGS="@EXTRA_LDFLAGS@"
-LIBS="@EXTRA_LIBS@"
+LIBS=""
 EXTRA_INCLUDES="@EXTRA_INCLUDES@"
 SHLIBPATH_VAR="@shlibpath_var@"
 APR_SOURCE_DIR="@apr_srcdir@"
diff --git a/apr/configure.in b/apr/configure.in
index f6b3d07..de0a817 100644
--- a/apr/configure.in
+++ b/apr/configure.in
@@ -198,7 +198,7 @@ AC_ARG_WITH(libtool, [  --without-libtoo
 if test "x$use_libtool" = "xyes"; then
       lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) \$(ALL_LIBS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
@@ -526,9 +526,7 @@ dnl end up LIBS="-lm -lcrypt -lnsl  -ldl
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(gethostname, nsl)
 AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(crypt, crypt ufc)
 AC_CHECK_LIB(truerand, main)
-AC_SEARCH_LIBS(modf, m)
 
 dnl ----------------------------- Checking for Threads
 echo "${nl}Checking for Threads..."