diff --git a/ChangeLog b/ChangeLog
index 73283c6c5..e204153fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-08  Jim Meyering  <jim@meyering.net>
+
+	* bootstrap: Export CVS_RSH separate from its assignment, to work
+	even with Solaris 10's /bin/sh.  Suggestion from Mark D. Baushke.
+
 2006-09-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: tail now ignores the -f option if POSIXLY_CORRECT is set,
diff --git a/bootstrap b/bootstrap
index d4f65142e..b4eec8985 100755
--- a/bootstrap
+++ b/bootstrap
@@ -137,7 +137,7 @@ case ${GNULIB_SRCDIR--} in
     esac
 
     case $CVS_RSH in
-    '') export CVS_RSH=ssh;;
+    '') CVS_RSH=ssh; export CVS_RSH;;
     esac
 
     trap cleanup_gnulib 1 2 13 15