diff --git a/ChangeLog b/ChangeLog
index 2221797b7..d56ef47b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Bring following over from gcc:
+
+2002-09-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* configure.in (s390*-*-linux*): Enable libgcj.
+
 2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* Makefile.in: Regenerate.  This really ought to fix things. :sigh:
diff --git a/configure.in b/configure.in
index 3041dd4a7..bee4c2998 100644
--- a/configure.in
+++ b/configure.in
@@ -421,10 +421,6 @@ case "${target}" in
   i[34567]86-*-freebsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
-  s390*-*-linux*)
-    # The libffi port is not yet in the GCC tree
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
   i[3456]86-*-linux*)
     # This section makes it possible to build newlib natively on linux.
     # If we are using a cross compiler then don't configure newlib.