diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4873ed6f2f2..3edc73c5768 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 16 14:06:56 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* decl.c (store_parm_decls): last_parm_cleanup_insn is the insn
+ 	after the exception spec.
+
 Mon Sep 15 11:52:13 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* call.c (null_ptr_cst_p): Integer type, not integral type.
diff --git a/gcc/cp/NEWS b/gcc/cp/NEWS
index ecfa34ff378..0a8df4c92ce 100644
--- a/gcc/cp/NEWS
+++ b/gcc/cp/NEWS
@@ -7,6 +7,8 @@
 
   for more information.
 
+* Member function templates are now supported.
+
 * New flags -Wsign-promo (warn about potentially confusing promotions in
   overload resolution), -Wno-pmf-conversion (don't warn about converting
   from a bound member function pointer to function pointer).
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 446befb4cc9..c57f522e7a3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11680,8 +11680,6 @@ store_parm_decls ()
       expand_start_bindings (0);
     }
 
-  last_parm_cleanup_insn = get_last_insn ();
-
   if (! processing_template_decl && flag_exceptions)
     {
       /* Do the starting of the exception specifications, if we have any.  */
@@ -11689,6 +11687,7 @@ store_parm_decls ()
 	expand_start_eh_spec ();
     }
 
+  last_parm_cleanup_insn = get_last_insn ();
   last_dtor_insn = get_last_insn ();
 }