Makefile.in   |    6 ++++--
 apr-config.in |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5dcb4ba..9929b6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,8 +81,10 @@ install: $(TARGETS)
 	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-config.in b/apr-config.in
index 84b4073..e45faa1 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -36,7 +36,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@"