diff --git a/ChangeLog b/ChangeLog
index c62909b05e2..c06d29ace95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-07  Andrew Haley  <aph@redhat.com>
+
+	* configure.ac (noconfigdirs): Remove target-libffi and
+	target-libjava.
+	* configure: Regenerate.
+
 2007-09-06  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR target/33281
diff --git a/configure b/configure
index 64ce7cffb69..20d1d852297 100755
--- a/configure
+++ b/configure
@@ -2241,8 +2241,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     ;;
   arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+    noconfigdirs="$noconfigdirs target-qthreads"
+    noconfigdirs="$noconfigdirs target-libobjc"
     case ${with_newlib} in
       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     esac
diff --git a/configure.ac b/configure.ac
index b0eabdd3df4..a8d19b8db1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,8 +517,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     ;;
   arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+    noconfigdirs="$noconfigdirs target-qthreads"
+    noconfigdirs="$noconfigdirs target-libobjc"
     case ${with_newlib} in
       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     esac