diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e27477c96b7e2e2540b8f226d9ce6a5d9d8db94e..3f49f1b798d3718e31d5e793423fe5a4c585c475 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-10  Arnaud Charlet  <charlet@act-europe.fr>,
+	    Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	PR ada/6637, PR ada/5911
+	Merge with libada-branch:
+        * config-lang.in: Build libada only when ada is built.
+
 2004-02-09  Ed Schonberg  <schonberg@gnat.com>
 
 	* exp_ch4.adb (Expand_N_Op_Eq): When looking for the primitive equality
diff --git a/gcc/ada/config-lang.in b/gcc/ada/config-lang.in
index 3875992c6d1592034ef50738dee3534a8f47723b..9a9599dbf1b09b4cfb315b970b3068b8d4241f19 100644
--- a/gcc/ada/config-lang.in
+++ b/gcc/ada/config-lang.in
@@ -37,3 +37,5 @@ stagestuff="gnatbind\$(exeext) gnat1\$(exeext)"
 gtfiles="\$(srcdir)/ada/ada-tree.h \$(srcdir)/ada/gigi.h \$(srcdir)/ada/decl.c \$(srcdir)/ada/trans.c \$(srcdir)/ada/utils.c"
 
 outputs=ada/Makefile
+
+target_libs="target-libada"