diff --git a/ChangeLog b/ChangeLog
index 3d9860acf04..d0b4abf1eb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-2001-10-11  Hans-Peter Nilsson  <hp@axis.com>
+2001-10-11  Hans-Peter Nilsson  <hp@bitrange.com>
 
+	* configure.in (noconfigdirs) [cris-*-*]: Disable libgcj.
 	* MAINTAINERS: Add self as maintainer of CRIS port.
 
 2001-10-10  Geert Bosch  <bosch@gnat.com>
diff --git a/configure.in b/configure.in
index 162d9b32e6a..c4d660dbb6f 100644
--- a/configure.in
+++ b/configure.in
@@ -719,6 +719,9 @@ case "${target}" in
   arm-*-riscix*)
     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
     ;;
+  cris-*-*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
   d10v-*-*)
     noconfigdirs="$noconfigdirs target-librx ${libstdcxx_version} target-libgloss ${libgcj}"
     ;;