diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3b4f8b17aa7..55a81ec3f4f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-05  Fabien Chene <fabien.chene@gmail.com>
+
+	PR c++/35219
+	* cp-tree.h: Fix DECL_NONSTATIC_MEMBER_P to handle member template
+	functions.
+
 2008-11-05  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/37742
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 7ff5824180a..b79b819f592 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1978,8 +1978,7 @@ struct lang_decl GTY(())
 
 /* Nonzero for a DECL means that this member is a non-static member.  */
 #define DECL_NONSTATIC_MEMBER_P(NODE)		\
-  ((TREE_CODE (NODE) == FUNCTION_DECL		\
-    && DECL_NONSTATIC_MEMBER_FUNCTION_P (NODE))	\
+  (DECL_NONSTATIC_MEMBER_FUNCTION_P (NODE)	\
    || TREE_CODE (NODE) == FIELD_DECL)
 
 /* Nonzero for _DECL means that this member object type
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 79811bd34e3..1049f5f50a6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-05  Fabien Chene <fabien.chene@gmail.com>
+
+	PR c++/32519
+	* g++.dg/template/pr32519.C: New test.
+
 2008-11-05  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/37742