diff --git a/ChangeLog b/ChangeLog
index bac0f2b71d..6423239fc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov  5 17:29:06 2016  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS#extract_resources): Use each_resource
+	  instead of each_answer.
+	  [ruby-core:75461] [Bug#12372] reported by Rafael Fernandez Lopez.
+
 Sat Nov  5 17:18:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/-test/file/fs.c (get_atime_p): Updating of file access times
diff --git a/lib/resolv.rb b/lib/resolv.rb
index ca4c7581ba..bfff58b035 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -572,13 +572,13 @@ class Resolv
     def extract_resources(msg, name, typeclass) # :nodoc:
       if typeclass < Resource::ANY
         n0 = Name.create(name)
-        msg.each_answer {|n, ttl, data|
+        msg.each_resource {|n, ttl, data|
           yield data if n0 == n
         }
       end
       yielded = false
       n0 = Name.create(name)
-      msg.each_answer {|n, ttl, data|
+      msg.each_resource {|n, ttl, data|
         if n0 == n
           case data
           when typeclass
@@ -590,7 +590,7 @@ class Resolv
         end
       }
       return if yielded
-      msg.each_answer {|n, ttl, data|
+      msg.each_resource {|n, ttl, data|
         if n0 == n
           case data
           when typeclass