diff --git a/ChangeLog b/ChangeLog
index 292229baf0..ec816cf52b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug  6 07:06:34 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (w_object):  Fix exception message when _dump_data is not
+	  defined on a T_DATA object.
+
 Fri Aug  5 22:16:20 2011  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
diff --git a/marshal.c b/marshal.c
index 557436894a..9a43cdb4d1 100644
--- a/marshal.c
+++ b/marshal.c
@@ -824,7 +824,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
 
 		if (!rb_respond_to(obj, s_dump_data)) {
 		    rb_raise(rb_eTypeError,
-			     "no marshal_dump is defined for class %s",
+			     "no _dump_data is defined for class %s",
 			     rb_obj_classname(obj));
 		}
 		v = rb_funcall(obj, s_dump_data, 0);