diff --git a/ChangeLog b/ChangeLog
index d771c4fb2f..b808200822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon May 10 03:36:56 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* vm_eval.c (eval_string_with_cref): propagative filename and line_no
+	  of binding.  [ruby-dev:38767] [ruby-core:28307]
+
+	* vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
+	  preserve them.
+
 Mon May 10 02:58:33 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block,
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index c5ab95302b..9ae50a6d30 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -287,7 +287,7 @@ assert_normal_exit %q{
   eval("", method(:proc).call {}.binding)
 }
 
-assert_equal "(eval):1:in `block in <main>': ", %q{
+assert_equal "", %q{
   b = binding
   10.times{
     eval('', b)
diff --git a/proc.c b/proc.c
index 7f7c2e8cd0..fc05a8eae0 100644
--- a/proc.c
+++ b/proc.c
@@ -255,6 +255,7 @@ binding_mark(void *ptr)
     if (ptr) {
 	bind = ptr;
 	RUBY_MARK_UNLESS_NULL(bind->env);
+	RUBY_MARK_UNLESS_NULL(bind->filename);
     }
     RUBY_MARK_LEAVE("binding");
 }
@@ -290,6 +291,8 @@ binding_dup(VALUE self)
     GetBindingPtr(self, src);
     GetBindingPtr(bindval, dst);
     dst->env = src->env;
+    dst->filename = src->filename;
+    dst->line_no = src->line_no;
     return bindval;
 }
 
@@ -316,6 +319,8 @@ rb_binding_new(void)
 
     GetBindingPtr(bindval, bind);
     bind->env = rb_vm_make_env_object(th, cfp);
+    bind->filename = cfp->iseq->filename;
+    bind->line_no = rb_vm_get_sourceline(cfp);
     return bindval;
 }
 
@@ -1892,6 +1897,8 @@ proc_binding(VALUE self)
     bindval = binding_alloc(rb_cBinding);
     GetBindingPtr(bindval, bind);
     bind->env = proc->envval;
+    bind->filename = proc->block.iseq->filename;
+    bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
     return bindval;
 }
 
diff --git a/vm_core.h b/vm_core.h
index 050d7834b4..2c02315c2e 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -524,6 +524,8 @@ typedef struct {
 
 typedef struct {
     VALUE env;
+    VALUE filename;
+    unsigned short line_no;
 } rb_binding_t;
 
 /* used by compile time and send insn */
diff --git a/vm_eval.c b/vm_eval.c
index fefe6d6dfd..9806762d96 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -963,6 +963,10 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 	    if (rb_obj_is_kind_of(scope, rb_cBinding)) {
 		GetBindingPtr(scope, bind);
 		envval = bind->env;
+		if (strcmp(file, "(eval)") == 0) {
+		    file = RSTRING_PTR(bind->filename);
+		    line = bind->line_no;
+		}
 	    }
 	    else {
 		rb_raise(rb_eTypeError,