diff --git a/ChangeLog b/ChangeLog
index 328f93f68a..f1743a31cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 17 22:43:11 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): massign should return rvalue(s).
+
 Fri Aug 17 22:10:19 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* test/ruby/test_basicinstructions.rb: fix old tests.
diff --git a/compile.c b/compile.c
index e6db61718a..e1ab85b180 100644
--- a/compile.c
+++ b/compile.c
@@ -3200,15 +3200,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret,
-			node->nd_value,	/* rhsn  */
-			node->nd_args,	/* splat */
-			node->nd_head,	/* lhsn  */
-			0);
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	break;
+	  if (poped) {
+	      compile_massign(iseq, ret,
+			      node->nd_value,	/* rhsn  */
+			      node->nd_args,	/* splat */
+			      node->nd_head,	/* lhsn  */
+			      0);
+	  }
+	  else {
+	      COMPILE(ret, "masgn/value", node->nd_value);
+	      ADD_INSN(ret, nd_line(node), dup);
+	      compile_massign(iseq, ret, 0,
+			      node->nd_args, node->nd_head, 0);
+	  }
+	  break;
       }
 
       case NODE_LASGN:{