diff --git a/ChangeLog b/ChangeLog
index 1dda90b33..9f24837a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-15  Mikael Djurfeldt  <mdj@chunk.mit.edu>
+
+	* configure.in: Use AC_PROG_LIBTOOL instead of AM_PROG_LIBTOOL.
+
 2004-01-25  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* configure.in (GUILE_FUNC_DECLARED), acinclude.m4
diff --git a/configure.in b/configure.in
index 923672f88..509ea8e32 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ AC_MINIX
 AM_PROG_CC_STDC
 
 AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_LIB_LTDL
 
 AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index 941510096..e0d55381a 100644
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-15  Mikael Djurfeldt  <mdj@chunk.mit.edu>
+
+	* scheme-compound.texi (Hash Table Reference): Renamed hash-map
+	--> hash-map->list.
+
 2004-02-15  Kevin Ryde  <user42@zip.com.au>
 
 	* scheme-compound.texi (Hash Table Reference): In scm_hash_ref etc,
diff --git a/doc/ref/scheme-compound.texi b/doc/ref/scheme-compound.texi
index 49dd5d939..c74d4881d 100644
--- a/doc/ref/scheme-compound.texi
+++ b/doc/ref/scheme-compound.texi
@@ -2481,17 +2481,17 @@ create an entry for it with @var{init} as the value, and return that
 pair.
 @end deffn
 
-@deffn {Scheme Procedure} hash-map proc table
+@deffn {Scheme Procedure} hash-map->list proc table
 @deffnx {Scheme Procedure} hash-for-each proc table
-@deffnx {C Function} scm_hash_map (proc, table)
+@deffnx {C Function} scm_hash_map_to_list (proc, table)
 @deffnx {C Function} scm_hash_for_each (proc, table)
 Apply @var{proc} to the entries in the given hash @var{table}.  Each
-call is @code{(@var{proc} @var{key} @var{value})}.  @code{hash-map}
+call is @code{(@var{proc} @var{key} @var{value})}.  @code{hash-map->list}
 returns a list of the results from these calls, @code{hash-for-each}
 discards the results and returns an unspecified value.
 
 Calls are made over the table entries in an unspecified order, and for
-@code{hash-map} the order of the values in the returned list is
+@code{hash-map->list} the order of the values in the returned list is
 unspecified.  Results will be unpredictable if @var{table} is modified
 while iterating.
 
@@ -2499,7 +2499,7 @@ For example the following returns a new alist comprising all the
 entries from @code{mytable}, in no particular order.
 
 @example
-(hash-map cons mytable)
+(hash-map->list cons mytable)
 @end example
 @end deffn
 
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 8d94208bb..82ed015c3 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-15  Mikael Djurfeldt  <mdj@chunk.mit.edu>
+
+	* configure.in: Use AC_PROG_LIBTOOL instead of AM_PROG_LIBTOOL.
+
 2004-02-08  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
 
 	* Makefile.am (TAGS_FILES): Use this variable instead of
diff --git a/guile-readline/configure.in b/guile-readline/configure.in
index 1d389752a..e9325ea3c 100644
--- a/guile-readline/configure.in
+++ b/guile-readline/configure.in
@@ -10,7 +10,7 @@ AC_PROG_INSTALL
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl
 dnl Check for Winsock and other functionality on Win32 (*not* CygWin)