diff --git a/ChangeLog b/ChangeLog
index 5290121456..2e6f9ca649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 22 15:48:06 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* configure.in: Also look in $PATH when searching for
+ 	install-info.  Remove autoconf bug workaround and require autoconf
+ 	2.13.
+
 1999-03-21  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* db/Makefile: Don't try to install shared library link if not
diff --git a/FAQ.in b/FAQ.in
index ab42dc5924..b0d5d0c14d 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -437,8 +437,9 @@ functions together with glibc.
 
 The functions are available, as an add-on (see ?addon).  People in the US
 may get it from the same place they got GNU libc from.  People outside the
-US should get the code from ftp://ftp.ifi.uio.no/pub/gnu, or another archive
-site outside the USA.  The README explains how to install the sources.
+US should get the code from ftp.funet.fi [128.214.248.6] in the directory
+pub/gnu/funet, or another archive site outside the USA.  The README explains
+how to install the sources.
 
 If you already have the crypt code on your system the reason for the failure
 is probably that you did not link with -lcrypt.  The crypto functions are in
diff --git a/configure.in b/configure.in
index 40ed517fcf..7a639231a8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION([$CVSid$])
-AC_PREREQ(2.11)dnl		dnl Minimum Autoconf version required.
+AC_PREREQ(2.13)dnl		dnl Minimum Autoconf version required.
 AC_INIT(include/features.h)
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(scripts)
@@ -561,9 +561,8 @@ AC_SUBST(libc_cv_have_ksh)
 AC_PROG_AWK
 AC_PATH_PROG(PERL, perl, no)
 AC_SUBST(PERL)
-dnl This works around a bug in autoconf.
-install_info_path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
-AC_PATH_PROG(INSTALL_INFO, install-info, no, $install_info_path)
+AC_PATH_PROG(INSTALL_INFO, install-info, no,
+	     $PATH:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin)
 AC_SUBST(INSTALL_INFO)
 if test "$INSTALL_INFO" != "no"; then
 AC_CACHE_CHECK(for old Debian install-info, libc_cv_old_debian_install_info,
diff --git a/elf/Makefile b/elf/Makefile
index 5236165e2a..a791ffdbc0 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -77,7 +77,9 @@ others		+= ldconfig
 install-rootsbin += ldconfig
 endif
 
+ifeq (yes,$(build-shared))
 tests = loadtest restest1 preloadtest loadfail multiload
+endif
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj
 extra-objs += $(modules-names:=.os)