diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 96c67b1fcea..4b1f41f7421 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -3,6 +3,8 @@
 	* resolve.c (resolve_code): Impose correct restrictions on
 	assigned variable.
 
+	* decl.c (gfc_match_end): Use locus of END when eos is an error.
+
 2004-12-02  Steven G. Kargl  <kargls@comcast.net>
 	Paul Brook  <paul@codesourcery.com>
 
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 5f7e8462c2d..97b5e1f15e8 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -2576,8 +2576,8 @@ gfc_match_end (gfc_statement * st)
       if (!eos_ok)
 	{
 	  /* We would have required END [something]  */
-	  gfc_error ("%s statement expected at %C",
-		     gfc_ascii_statement (*st));
+	  gfc_error ("%s statement expected at %L",
+		     gfc_ascii_statement (*st), &old_loc);
 	  goto cleanup;
 	}