diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index dc6a2663a9b..ecd9bac1526 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29518
+	* pt.c (coerce_template_parms): Do not skip_evaluation while
+	substituting template arguments.
+
 2006-11-11  Richard Guenther  <rguenther@suse.de>
 
 	* typeck.c (build_unary_op): Remove handling of FIX_CEIL_EXPR,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b0dc1fe4d08..faba37f33b2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/29518
+	* g++.dg/template/static28.C: New test.
+
 2006-11-13  Carlos O'Donell  <carlos@codesourcery.com>
 
 	* lib/c-torture.exp: Use target-libpath.exp.