diff --git a/ChangeLog b/ChangeLog
index 4f10a73620..d2f83b5b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jul 11 15:36:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in ({,dist-,real-}clean-ext): omission of "in WORDS" of
+	  FOR-statement is not allowed in /bin/sh on Solaris.  fore-ported
+	  r28609 from 1.9.2.
+
+	* tool/rmdirs: ditto.
+
 Sun Jul 11 11:07:42 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/rdoc/test_rdoc_ri_driver.rb (test_formatter): add a test.  a
diff --git a/Makefile.in b/Makefile.in
index b94d86e06c..ee2f2b5e1f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,11 +259,11 @@ distclean-rdoc:
 clean-ext distclean-ext realclean-ext::
 	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
-	set dummy `for dir; do \
+	set dummy `for dir in "$$@"; do \
 	    find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
 	done`; shift; \
 	cd ..; \
-	for dir; do \
+	for dir in "$$@"; do \
 	    echo $(@:-ext=)ing "$$dir"; \
 	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
 	    case "$@" in \
diff --git a/tool/rmdirs b/tool/rmdirs
index b116898fac..1dde99f547 100755
--- a/tool/rmdirs
+++ b/tool/rmdirs
@@ -1,5 +1,5 @@
 #!/bin/sh
-for dir; do
+for dir in "$@"; do
     while rmdir "$dir" >/dev/null 2>&1 &&
           parent=`expr "$dir" : '\(.*\)/[^/][^/]*'`; do
         case "$parent" in