diff --git a/config/ChangeLog b/config/ChangeLog
index 78259e635..506837b8c 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-21  Alexandre Oliva  <aoliva@redhat.com>
+
+	* bootstrap-lto.mk: New.
+
 2010-06-10  Paolo Bonzini  <bonzini@gnu.org>
 
 	* override.m4: Remove obsolete (<2.64) definitions.
diff --git a/config/bootstrap-lto.mk b/config/bootstrap-lto.mk
new file mode 100644
index 000000000..14099a08b
--- /dev/null
+++ b/config/bootstrap-lto.mk
@@ -0,0 +1,8 @@
+# This option enables LTO for stage2 and stage3.  It requires lto to
+# be enabled for stage1 with --enable-stage1-languages.
+
+STAGE2_CFLAGS += -flto
+STAGE3_CFLAGS += -flto
+
+# Ada fails to build with LTO, turn it off for now.
+BOOT_ADAFLAGS += -fno-lto