diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6b7a2171c5..b19d15a693 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-07  Corinna Vinschen  <vinschen@redhat.com>
+
+	* gdb.base/ending-run.exp: Add sh specific case.
+
 2003-10-06  Andrew Cagney  <cagney@redhat.com>
 
 	* gdb.base/watchpoint.exp: Delete obsolete clear_xfail.
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 3960f0621d..af32acd067 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -202,6 +202,11 @@ gdb_expect {
 	    -re ".*in __wrap__?main ().*$gdb_prompt $" {
 		pass "step out of main (status wrapper)"
 	    }
+	    -re "__setup_argv_for_main (.*).*$gdb_prompt $" {
+		# On sh, another wrapper function (start_l) exists, so
+		# another `next' is necessary.
+		gdb_test "next" ".*in start_l ().*" "step out of main (on sh)"
+	    }
             -re ".*$gdb_prompt $" { fail "step out of main (at end 2)" }
 	    timeout { 
 		fail "step out of main (hang or timeout on step at end 2)"