diff --git a/ChangeLog b/ChangeLog
index 810efbadd9..42b1950061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 20 12:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
+
+	* object.c: Document Data class by Matthew Mongeau [Backport #7929]
+
 Wed Feb 20 11:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/mutex_m.rb: Add rdoc for Mutex_m module [Backport #7930]
diff --git a/object.c b/object.c
index 1bec19297b..ceee4d47eb 100644
--- a/object.c
+++ b/object.c
@@ -3132,6 +3132,12 @@ Init_Object(void)
     rb_undef_method(rb_cClass, "extend_object");
     rb_undef_method(rb_cClass, "append_features");
 
+    /*
+     * Document-class: Data
+     *
+     * This is a recommended base class for C extensions using Data_Make_Struct
+     * or Data_Wrap_Struct, see README.EXT for details.
+     */
     rb_cData = rb_define_class("Data", rb_cObject);
     rb_undef_alloc_func(rb_cData);