diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b6963efa28..306d277187a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/54323
+	* g++.dg/cpp0x/pr54323.C: New.
+
 2012-10-04  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/54735
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr54323.C b/gcc/testsuite/g++.dg/cpp0x/pr54323.C
new file mode 100644
index 00000000000..71b6c7192df
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr54323.C
@@ -0,0 +1,37 @@
+// PR c++/54323
+// { dg-do compile { target c++11 } }
+
+template<bool, typename T = void>
+struct enable_if { };
+
+template<typename T>
+struct enable_if<true, T>
+{ typedef T type; };
+
+template<template<typename> class CRTP, typename T>
+class Base
+{
+public:
+  template<template<typename> class CRTP0, typename T0, class>
+  friend int func(const Base<CRTP0, T0>& rhs);
+
+protected:
+  int n;
+};
+
+template<template<typename> class CRTP0, typename T0,
+	 class = typename enable_if<true>::type>
+int func(const Base<CRTP0, T0>& rhs)
+{
+  return rhs.n;
+}
+
+template<typename T>
+class Derived : public Base<Derived, T> {};
+
+int main()
+{
+  Derived<int> x;
+  func(x);
+  return 0;
+}