diff --git a/configure b/configure
index 40178dddf7..58fd8852a7 100755
--- a/configure
+++ b/configure
@@ -1275,9 +1275,9 @@ case "${target}" in
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-elf)
 	unsupported_languages="$unsupported_languages f95"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+	noconfigdirs="$noconfigdirs target-boehm-gc";;
       *-*-linux*)
-	noconfigdirs="$noconfigdirs target-libffi target-newlib target-libgloss";;
+	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
       *)
 	unsupported_languages="$unsupported_languages f95"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
diff --git a/configure.in b/configure.in
index 10571b4a75..8535589ed2 100644
--- a/configure.in
+++ b/configure.in
@@ -492,9 +492,9 @@ case "${target}" in
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-elf)
 	unsupported_languages="$unsupported_languages f95"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+	noconfigdirs="$noconfigdirs target-boehm-gc";;
       *-*-linux*)
-	noconfigdirs="$noconfigdirs target-libffi target-newlib target-libgloss";;
+	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
       *)
 	unsupported_languages="$unsupported_languages f95"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;