diff --git a/ChangeLog b/ChangeLog
index 738b45a2a0..4451ca8adb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug  5 12:54:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
+	  [ruby-core:24767]
+
 Wed Aug  5 12:39:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_longjmp): reset raised flag before fatal error.
diff --git a/eval.c b/eval.c
index f1589e25f3..35669c8395 100644
--- a/eval.c
+++ b/eval.c
@@ -413,12 +413,14 @@ rb_longjmp(int tag, volatile VALUE mesg)
 void
 rb_exc_raise(VALUE mesg)
 {
+    mesg = rb_make_exception(1, &mesg);
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
 rb_exc_fatal(VALUE mesg)
 {
+    mesg = rb_make_exception(1, &mesg);
     rb_longjmp(TAG_FATAL, mesg);
 }