diff --git a/ChangeLog b/ChangeLog
index a58315dc1..281c2a28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (i[[3456789]]86-*-msdosdjgpp*): Don't disable
+	libffi on host.
+	(x86_64-*-mingw*, i[[3456789]]86-*-mingw32*): Don't disable newlib
+	on host.
+	(c54x*-*-* | tic54x-*-*): Don't disable newlib on host.
+	* configure: Regenerate.
+
 2011-03-26  John Marino  <binutils@marino.st>
 
 	* configure.ac: Add support for *-*-dragonfly*
diff --git a/configure b/configure
index a12de6dad..9322d7b84 100755
--- a/configure
+++ b/configure
@@ -2966,13 +2966,7 @@ unsupported_languages=
 
 case "${host}" in
   i[3456789]86-*-msdosdjgpp*)
-    noconfigdirs="$noconfigdirs tcl tk itcl libffi"
-    ;;
-  x86_64-*-mingw*)
-    noconfigdirs="$noconfigdirs newlib"
-    ;;
-  i[3456789]86-*-mingw32*)
-    noconfigdirs="$noconfigdirs newlib"
+    noconfigdirs="$noconfigdirs tcl tk itcl"
     ;;
 esac
 
@@ -3234,7 +3228,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
     ;;
   c54x*-*-* | tic54x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
+    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb"
     ;;
   cr16-*-*)
     noconfigdirs="$noconfigdirs ${libgcj} gdb"
diff --git a/configure.ac b/configure.ac
index 34aad7598..ca5a45f31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,13 +422,7 @@ unsupported_languages=
 
 case "${host}" in
   i[[3456789]]86-*-msdosdjgpp*)
-    noconfigdirs="$noconfigdirs tcl tk itcl libffi"
-    ;;
-  x86_64-*-mingw*)
-    noconfigdirs="$noconfigdirs newlib"
-    ;;
-  i[[3456789]]86-*-mingw32*)
-    noconfigdirs="$noconfigdirs newlib"
+    noconfigdirs="$noconfigdirs tcl tk itcl"
     ;;
 esac
 
@@ -680,7 +674,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
     ;;
   c54x*-*-* | tic54x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
+    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb"
     ;;
   cr16-*-*)
     noconfigdirs="$noconfigdirs ${libgcj} gdb"