diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7e8cb395cf1571a1e3c35c6af4c942796c69aaf5..1aacb2025469a6d4ec30f4a7f53daa47415ee781 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04  Steven G. Kargl <kargls@comcast.net>
+
+	PR fortran/24636
+	* match.c (gfc_match_stopcode):  Set stop_code = -1.
+
 2005-11-04  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR fortran/18452
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index eac5697c5e400cb611b2a1eaba238d5fc5a30c8e..8725a5f0399442e5a6eeee3a3989485c5a588428 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -1405,7 +1405,7 @@ gfc_match_stopcode (gfc_statement st)
   gfc_expr *e;
   match m;
 
-  stop_code = 0;
+  stop_code = -1;
   e = NULL;
 
   if (gfc_match_eos () != MATCH_YES)
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c3c5a9ecb6ffc4e168fb7a871f2ad6829a6b0573..bb8e3323d1a6b9bb6c6f573afaf6b0e99f28dbe9 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04  Steven G. Kargl <kargls@comcast.net>
+
+	PR fortran/24636
+	* runtime/stop.c (stop_numeric): Use stop_code = -1.
+
 2005-11-04  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR libfortran/22298
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 768d75bbc0a5d2f5f995a1fe0632d08559f6ddc8..920cc2c4f4558110f86f975f7c3ba7d002693ea4 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -40,7 +40,7 @@ stop_numeric (GFC_INTEGER_4 code)
   show_locus ();
 
   if (code == -1)
-    st_printf ("STOP\n");
+    code = 0;
   else
     st_printf ("STOP %d\n", (int)code);