diff --git a/ChangeLog b/ChangeLog
index 86c4533f3..a6bfb7f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac: Add 'lto' to enable_languages, not
+	new_enable_languages, and only if not already present.
+	* configure: Regenerate.
+
 2009-10-06  Ian Lance Taylor  <iant@google.com>
 
 	* Makefile.def: check-gold depends upon all-gas.
diff --git a/configure b/configure
index 76084ed51..1ece75c48 100755
--- a/configure
+++ b/configure
@@ -6593,7 +6593,10 @@ if test -d ${srcdir}/gcc; then
   # If LTO is enabled, add the LTO front end.
   extra_host_libiberty_configure_flags=
   if test "$enable_lto" = "yes" ; then
-    new_enable_languages="${new_enable_languages}lto,"
+    case ,${enable_languages}, in
+      *,lto,*) ;;
+      *) enable_languages="${enable_languages},lto" ;;
+    esac
     if test "${ENABLE_GOLD}" = "yes" ; then
       configdirs="$configdirs lto-plugin"
       extra_host_libiberty_configure_flags=--enable-shared
diff --git a/configure.ac b/configure.ac
index c961fe8ba..407ab595e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1811,7 +1811,10 @@ if test -d ${srcdir}/gcc; then
   # If LTO is enabled, add the LTO front end.
   extra_host_libiberty_configure_flags=
   if test "$enable_lto" = "yes" ; then
-    new_enable_languages="${new_enable_languages}lto,"
+    case ,${enable_languages}, in
+      *,lto,*) ;;
+      *) enable_languages="${enable_languages},lto" ;;
+    esac
     if test "${ENABLE_GOLD}" = "yes" ; then
       configdirs="$configdirs lto-plugin"
       extra_host_libiberty_configure_flags=--enable-shared