diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0393ea84396..2896ce26dc7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,8 @@
 2005-10-16  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/22173
-	* decl.c (check_template_keyword): Fix thinko.
-	
+	* typeck.c (check_template_keyword): Fix thinko.
+		
 2005-10-16  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR c++/23959
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index bc34a403806..e3c431d96d0 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1873,8 +1873,9 @@ check_template_keyword (tree decl)
       else
 	{
 	  tree fns;
-	  if (BASELINK_P (decl))
-	    fns = BASELINK_FUNCTIONS (decl);
+	  fns = decl;
+	  if (BASELINK_P (fns))
+	    fns = BASELINK_FUNCTIONS (fns);
 	  while (fns)
 	    {
 	      tree fn = OVL_CURRENT (fns);