diff --git a/ChangeLog b/ChangeLog
index 289949a5b8..a9a727c6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  7 21:02:56 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (nil_to_s): returns the empty string again.
+	  [ruby-dev:29520]
+
 Thu Sep  7 23:27:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (path_check_0, fpath_check): disable path check on cygwin.
diff --git a/object.c b/object.c
index 22f9ca7da5..dae9c78e89 100644
--- a/object.c
+++ b/object.c
@@ -675,15 +675,15 @@ nil_to_f(VALUE obj)
 
 /*
  *  call-seq:
- *     nil.to_s    => "nil"
+ *     nil.to_s    => ""
  *  
- *  Always returns the string "nil".
+ *  Always returns the empty string.
  */
 
 static VALUE
 nil_to_s(VALUE obj)
 {
-    return rb_str_new2("nil");
+    return rb_str_new2("");
 }
 
 /*