diff --git a/ChangeLog b/ChangeLog
index 024fdbf812..d02d38564f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 24 16:32:30 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/uri/generic.rb (eql?): Check the class of the compared object.
+	  Based on a patch by Peter McLain [ruby-core:27019]
+
 Thu Dec 24 15:20:03 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* regexec.c (match_at): follow enclen's change.
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index fd01f89797..1ca970de74 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1066,6 +1066,7 @@ module URI
     end
 
     def eql?(oth)
+      self.class == oth.class &&
       parser == oth.parser &&
       self.component_ary.eql?(oth.component_ary)
     end