diff --git a/ChangeLog b/ChangeLog
index a37777ecca..c79b5644ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Dec 26 22:27:45 2007  NARUSE, Yui <naruse@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
+	  Resolv::DNS::Label::Str.
+
+	* lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
+	  is not defined, so replace to_s.
+
+	* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
+	  int.arpa.
+
 Mon Dec 24 16:18:57 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/ri/ri_options.rb:  Fix ri --help listing of gem ri paths.
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 8f6b186bbf..1f549a4710 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -1032,7 +1032,7 @@ class Resolv
 
       def ==(other) # :nodoc:
         return false unless Name === other
-        return @labels == other.to_a && @absolute == other.absolute?
+        return @labels.join == other.to_a.join && @absolute == other.absolute?
       end
 
       alias eql? == # :nodoc:
@@ -1262,7 +1262,7 @@ class Resolv
         end
 
         def put_label(d)
-          self.put_string(d.string)
+          self.put_string(d.to_s)
         end
       end
 
@@ -2180,7 +2180,7 @@ class Resolv
 
     def to_name
       return DNS::Name.new(
-        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
+        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'arpa'])
     end
 
     def ==(other) # :nodoc: