diff --git a/ChangeLog b/ChangeLog
index 186c759fa1..634582707c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 13 18:19:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c: Class#inherited RDoc added.  a patch from Daniel
+	  Berger <djberg96 at gmail.com>  [ruby-core:08942]
+
 Fri Oct 13 02:30:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
diff --git a/object.c b/object.c
index 5f97357e71..3719817d8c 100644
--- a/object.c
+++ b/object.c
@@ -494,6 +494,34 @@ rb_obj_is_kind_of(obj, c)
 }
 
 
+/*
+ * Document-method: inherited
+ *
+ * call-seq:
+ *    inherited(subclass)
+ *
+ * Callback invoked whenever a subclass of the current class is created.
+ *
+ * Example:
+ *
+ *    class Foo
+ *       def self.inherited(subclass)
+ *          puts "New subclass: #{subclass}"
+ *       end
+ *    end
+ *
+ *    class Bar < Foo
+ *    end
+ *
+ *    class Baz < Bar
+ *    end
+ *
+ * produces:
+ *
+ *    New subclass: Bar
+ *    New subclass: Baz
+ */
+
 /*
  * Document-method: singleton_method_added
  *
@@ -605,7 +633,6 @@ rb_obj_dummy()
     return Qnil;
 }
 
-
 /*
  *  call-seq:
  *     obj.tainted?    => true or false