diff --git a/ChangeLog b/ChangeLog
index 2f7cf5e842..e0f332a2be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  9 22:27:05 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork): rewrite a complex "for" statement by
+	  simple statements. 
+
 Sat Jun  9 21:50:04 2012  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (retry_fork): extracted from rb_fork_err.
diff --git a/process.c b/process.c
index 41804166d2..e3f4f35892 100644
--- a/process.c
+++ b/process.c
@@ -2766,9 +2766,13 @@ retry_fork(int *status, int *ep)
 	rb_io_flush(rb_stderr)	\
 	)
 
-    prefork();
-    for (; before_fork(), (pid = fork()) < 0; prefork()) {
-	after_fork();
+    while (1) {
+        prefork();
+        before_fork();
+        pid = fork();
+        if (0 <= pid)
+            break;
+        after_fork();
 	switch (errno) {
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN