diff --git a/ChangeLog b/ChangeLog
index 3b0176a51e..93ab99e13b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 14 16:34:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): allow zero length symbols.
+	  [ruby-core:08861]
+
 Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_intern): raise SecurityError only when $SAFE
diff --git a/string.c b/string.c
index be10152e97..63d4b298df 100644
--- a/string.c
+++ b/string.c
@@ -4148,9 +4148,6 @@ rb_str_intern(VALUE s)
     volatile VALUE str = s;
     ID id;
 
-    if (!RSTRING_PTR(str) || RSTRING_LEN(str) == 0) {
-	rb_raise(rb_eArgError, "interning empty string");
-    }
     if (OBJ_TAINTED(str) && rb_safe_level() >= 1 && !rb_sym_interned_p(str)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't intern tainted string");
     }