diff --git a/ChangeLog b/ChangeLog
index b90b07190c0..01516ecaa2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (i[3456]86-*-linux*): Add check to disable
+	${libgcj} for glibc1.
+
 2002-10-24  Denis Chertykov  <denisc@overta.ru>
 
 	* MAINTAINERS: Add myself as ip2k port maintainer.
diff --git a/configure.in b/configure.in
index 87dd2c6dc41..6b714947a66 100644
--- a/configure.in
+++ b/configure.in
@@ -422,6 +422,13 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
   i[3456]86-*-linux*)
+    # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
+    # not build java stuff by default.
+    case "${target}" in
+      *-*-*libc1*)
+	noconfigdirs="$noconfigdirs ${libgcj}";;
+    esac
+
     # This section makes it possible to build newlib natively on linux.
     # If we are using a cross compiler then don't configure newlib.
     if test x${is_cross_compiler} != xno ; then