diff --git a/ChangeLog b/ChangeLog
index b25e02bcc5..4fc8d28baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 30 02:48:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_freeze): update rdoc to mention RuntimeError
+	  (not TypeError any longer) would be raised.  [ruby-dev:35982]
+
 Sat Aug 30 01:55:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (bigdivmod): remove redundant code.  a patch from
diff --git a/object.c b/object.c
index b796cfbf3c..36b99fc822 100644
--- a/object.c
+++ b/object.c
@@ -761,7 +761,7 @@ static st_table *immediate_frozen_tbl = 0;
  *     obj.freeze    => obj
  *  
  *  Prevents further modifications to <i>obj</i>. A
- *  <code>TypeError</code> will be raised if modification is attempted.
+ *  <code>RuntimeError</code> will be raised if modification is attempted.
  *  There is no way to unfreeze a frozen object. See also
  *  <code>Object#frozen?</code>.
  *     
@@ -771,7 +771,7 @@ static st_table *immediate_frozen_tbl = 0;
  *     
  *  <em>produces:</em>
  *     
- *     prog.rb:3:in `<<': can't modify frozen array (TypeError)
+ *     prog.rb:3:in `<<': can't modify frozen array (RuntimeError)
  *     	from prog.rb:3
  */