diff --git a/ChangeLog b/ChangeLog
index 6a04524..ff70f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-27  Bruno Haible  <bruno@clisp.org>
+
+	Fix missing ranlib detection when cross-compiling.
+	* aclocal.m4 (CL_PROG_RANLIB): Remove macro.
+	* lib/configure.in: Use AC_PROG_RANLIB instead of CL_PROG_RANLIB.
+
 2005-07-30  Bruno Haible  <bruno@clisp.org>
 
 	* src/version.cc: Bump version number to 3.0.2.
diff --git a/aclocal.m4 b/aclocal.m4
index bb22edc..e834c09 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,5 @@
 AC_PREREQ(2.12)
 
-AC_DEFUN(CL_PROG_RANLIB, [AC_CHECK_PROG(RANLIB, ranlib, ranlib, true)])
-
 AC_DEFUN(CL_PROG_INSTALL,
 [dnl This is mostly copied from AC_PROG_INSTALL.
 # Find a good install program.  We prefer a C program (faster),
diff --git a/lib/configure.in b/lib/configure.in
index 7def6a7..72f2c6a 100644
--- a/lib/configure.in
+++ b/lib/configure.in
@@ -1,6 +1,6 @@
 dnl autoconf configuration for gperf/lib
 
-dnl Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 2002, 2005 Free Software Foundation, Inc.
 dnl Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
 dnl and Bruno Haible <bruno@clisp.org>.
 dnl
@@ -34,7 +34,7 @@ AC_PROG_CXX
                       dnl sets variable CXX
 AC_PROG_CXXCPP
                       dnl sets variable CXXCPP
-CL_PROG_RANLIB
+AC_PROG_RANLIB
                       dnl sets variable RANLIB
 CL_PROG_INSTALL
                       dnl sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM