diff --git a/ChangeLog b/ChangeLog
index 156f55d9b30..e5bb91b1ccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-16  Nicolas Roche  <roche@adacore.com>
+
+	* Makefile.tpl: Add BOOT_ADAFLAGS.
+	* Makefile.in: Regenerate.
+
 2008-08-09  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* configure.ac (mips*-*-*linux*, mips*-*-gnu*): Use mt-mips-gnu.
@@ -3668,7 +3673,7 @@
 	of libf2c.
 	* configure, Makefile.in: Regenerate.
 
-2004-05-13  Tobias Schl���¼ter  <tobi@gcc.gnu.org>
+2004-05-13  Tobias Schl���¼ter  <tobi@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval): Add myself.
 
diff --git a/Makefile.in b/Makefile.in
index d9ef0681497..2ede05810ee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,6 +291,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
 BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
 
 BISON = @BISON@
 YACC = @YACC@
diff --git a/Makefile.tpl b/Makefile.tpl
index 1f0c318012f..a9dfd3e2af4 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -294,6 +294,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
 BOOT_LDFLAGS=
+BOOT_ADAFLAGS=-gnatpg -gnata
 
 BISON = @BISON@
 YACC = @YACC@