diff --git a/ChangeLog b/ChangeLog
index a62b4fe4b7..8991e0833a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 22 11:47:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_name): returns nil for anonymous modules.
+	  [ruby-talk:198440]
+
 Thu Jun 22 10:31:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_aref): "abc"[3] should not return an empty
diff --git a/variable.c b/variable.c
index 50f3e092fe..95f4743e33 100644
--- a/variable.c
+++ b/variable.c
@@ -163,7 +163,7 @@ classname(VALUE klass)
  *  call-seq:
  *     mod.name    => string
  *  
- *  Returns the name of the module <i>mod</i>.
+ *  Returns the name of the module <i>mod</i>.  Returns nil for anonymous modules.
  */
 
 VALUE
@@ -172,7 +172,7 @@ rb_mod_name(VALUE mod)
     VALUE path = classname(mod);
 
     if (!NIL_P(path)) return rb_str_dup(path);
-    return rb_str_new(0,0);
+    return path;
 }
 
 VALUE