diff --git a/ChangeLog b/ChangeLog
index ec66eb13e1..70cd4b2658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  1 10:38:28 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_autoload_load): autoloaded constants under a module
+	  belong to the module.  [ruby-core:01094], [ruby-dev:20309]
+
 Sat May 31 04:36:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* parse.y (rb_intern): should handle multibyte name.
diff --git a/variable.c b/variable.c
index 4835ab502e..11a931fa39 100644
--- a/variable.c
+++ b/variable.c
@@ -1194,17 +1194,7 @@ rb_autoload_load(klass, id)
     ID id;
 {
     VALUE file, value;
-    ID tmp = id;
 
-    if (!st_delete(RCLASS(klass)->iv_tbl, &tmp, &value) || value != Qundef) {
-	if (klass != rb_cObject)
-	    rb_name_error(id, "not autoload constant %s::%s",
-			  RSTRING(rb_class_path(klass))->ptr,
-			  rb_id2name(id));
-	else {
-	    rb_name_error(id, "not autoload constant %s", rb_id2name(id));
-	}
-    }
     file = autoload_delete(klass, id);
     if (NIL_P(file)) {
 	uninitialized_constant(klass, id);