diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 74e0684b3b83..8b2e99317e04 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 19 21:36:48 1999  Craig Burley  <craig@jcb-sc.com>
+
+	* ste.c (ffeste_R819B): Start the loop before expanding
+	the termination expression.
+
+	* version.c: Bump version.
+
 Sun Apr 18 21:53:58 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* com.c (ffecom_sym_transform_): COMMON and EQUIVALENCE
diff --git a/gcc/f/ste.c b/gcc/f/ste.c
index b87f532e6a5b..92c31429ae7d 100644
--- a/gcc/f/ste.c
+++ b/gcc/f/ste.c
@@ -3096,8 +3096,11 @@ ffeste_R819B (ffestw block, ffelab label UNUSED, ffebld expr)
 
     if (expr)
       {
+	tree loop;
+
 	result = ffecom_make_tempvar ("dowhile", integer_type_node,
 				      FFETARGET_charactersizeNONE, -1);
+	loop = expand_start_loop (1);
 
 	ffeste_start_stmt_ ();
 
@@ -3112,7 +3115,7 @@ ffeste_R819B (ffestw block, ffelab label UNUSED, ffebld expr)
 
 	ffeste_end_stmt_ ();
 
-	ffestw_set_do_hook (block, expand_start_loop (1));
+	ffestw_set_do_hook (block, loop);
 	expand_exit_loop_if_false (0, result);
       }
     else
diff --git a/gcc/f/version.c b/gcc/f/version.c
index 5ae6746189a6..d962b6705170 100644
--- a/gcc/f/version.c
+++ b/gcc/f/version.c
@@ -1 +1 @@
-const char *ffe_version_string = "0.5.24-19990418";
+const char *ffe_version_string = "0.5.24-19990419";