diff --git a/ChangeLog b/ChangeLog
index dd999eb2123..5d993d114f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-17  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (HAVE_X86_64_LIB64_DIR): Also set on s390x systems.
+
 2007-11-28  Petr Salinger  <Petr.Salinger@seznam.cz>  (tiny change)
 
 	* configure.in: Add support for gnu-kfreebsd.
diff --git a/configure b/configure
index 8242d6ef59f..859f6b74881 100755
--- a/configure
+++ b/configure
@@ -5828,7 +5828,7 @@ fi
 ### The standard library on x86-64 GNU/Linux distributions can
 ### be located in either /usr/lib64 or /usr/lib.
 case "${canonical}" in
-  x86_64-*-linux-gnu* )
+  x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
     if test -d /usr/lib64; then
 
 cat >>confdefs.h <<\_ACEOF