diff --git a/ChangeLog b/ChangeLog
index e44a06391f..34ba8a174e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  8 20:12:47 2008  wanabe  <s.wanabe@gmail.com>
+
+	* vm_insnhelper.c (vm_throw): regard break as return in lambda.
+	  [ruby-dev:34646]
+
 Sun Jun  8 19:17:59 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c: add a build option "CALC_EXACT_MALLOC_SIZE".
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 8a8f032413..2b32a3c94a 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1234,7 +1234,8 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
 		if (VM_FRAME_TYPE(cfp) == FRAME_MAGIC_LAMBDA) {
 		    /* lambda{... break ...} */
 		    is_orphan = 0;
-		    pt = dfp;
+		    pt = GET_LFP();
+		    state = TAG_RETURN;
 		}
 		else {
 		    dfp = GC_GUARDED_PTR_REF((VALUE *) *dfp);