diff --git a/lib/uri.rb b/lib/uri.rb
index 568ff008c7..f95d72b7ce 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -15,7 +15,7 @@
 =end
 
 module URI
-  VERSION_CODE = '000908'.freeze
+  VERSION_CODE = '000909'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
 end
 
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index b819dd12b3..4a671e9ed5 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -20,6 +20,7 @@ Object
 =end
 
   class Generic
+    include URI
     include REGEXP
 
 =begin
@@ -1085,7 +1086,7 @@ Object
       end
 
       if self.class == oth.class
-	self.normalize.to_ary == oth.normalize.to_ary
+	self.normalize.component_ary == oth.normalize.component_ary
       else
 	false
       end
@@ -1101,17 +1102,13 @@ Object
 #    end
 
 =begin
---- URI::Generic#to_a
 =end
-    def to_ary
+    def component_ary
       component.collect do |x|
 	self.send(x)
       end
     end
-
-    def to_a
-      to_ary
-    end
+    protected :component_ary
 
 =begin
 --- URI::Generic#select(*components)