diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d9b05a8be4fd..b3ba5a70c77c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/29054
+	* g++.dg/template/friend49.C: New test.
+
 2007-01-03  Steven G. Kargl  <kargls@comcast.net>
 
 	* gfortran.dg/ibits.f90: New test.
diff --git a/gcc/testsuite/g++.dg/template/friend49.C b/gcc/testsuite/g++.dg/template/friend49.C
new file mode 100644
index 000000000000..b4d717f5708a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend49.C
@@ -0,0 +1,18 @@
+// PR c++/29054
+// { dg-do compile }
+
+struct A
+{
+  template <typename T, typename U> static void create (U) {}
+};
+
+struct B
+{
+  friend void A::create <B, const char *> (const char *);
+};
+
+int
+main ()
+{
+  A::create<B>("test");
+}