diff --git a/ChangeLog b/ChangeLog
index 542ac92817..4ef53b86b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Oct 11 03:54:05 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: optimize 'for' statement when one variable given.
+
+	* benchmark/bm_loop_for.rb: added.
+
+	* benchmark/bm_loop_times.rb: modified.
+
 Sat Oct 11 12:09:05 2008  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/csv/csv.rb:  Added support for Encoding::default_internal.
diff --git a/benchmark/bm_loop_for.rb b/benchmark/bm_loop_for.rb
new file mode 100644
index 0000000000..398f6ff611
--- /dev/null
+++ b/benchmark/bm_loop_for.rb
@@ -0,0 +1,3 @@
+for i in 1..30_000_000
+  #
+end
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb
index c5317b8228..521f72ad1a 100644
--- a/benchmark/bm_loop_times.rb
+++ b/benchmark/bm_loop_times.rb
@@ -1 +1 @@
-30000000.times{|e|}
+30_000_000.times{|e|}
diff --git a/parse.y b/parse.y
index 88c423242d..9dad7cd79f 100644
--- a/parse.y
+++ b/parse.y
@@ -2772,16 +2772,27 @@ primary		: literal
 					     NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero),
 						      rb_intern("kind_of?"), NEW_LIST(NEW_LIT(rb_cArray))),
 					     0),
-					NEW_DASGN_CURR(id,
-						       NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)),
-					0),
+				    NEW_DASGN_CURR(id,
+						   NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)),
+				    0),
 				node_assign($2, NEW_DVAR(id)));
+
+			    args = new_args(m, 0, id, 0, 0);
 			}
 			else {
-			    m->nd_next = node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id));
+			    if (nd_type($2) == NODE_LASGN ||
+				nd_type($2) == NODE_DASGN ||
+				nd_type($2) == NODE_DASGN_CURR) {
+				$2->nd_value = NEW_DVAR(id);
+				m->nd_plen = 1;
+				m->nd_next = $2;
+				args = new_args(m, 0, 0, 0, 0);
+			    }
+			    else {
+				m->nd_next = node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id));
+				args = new_args(m, 0, id, 0, 0);
+			    }
 			}
-
-			args = new_args(m, 0, id, 0, 0);
 			scope = NEW_NODE(NODE_SCOPE, tbl, $8, args);
 			tbl[0] = 1; tbl[1] = id;
 			$$ = NEW_FOR(0, $5, scope);