diff --git a/ChangeLog b/ChangeLog
index dc74fd201d..c0f2b1289d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 24 20:38:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
+	  fixed: [ruby-list:40058], [ruby-dev:27479]
+
 Mon Oct 24 11:01:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys): 
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
index 5a99d04d55..6534d20760 100644
--- a/ext/Win32API/lib/win32/resolv.rb
+++ b/ext/Win32API/lib/win32/resolv.rb
@@ -84,7 +84,7 @@ if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
                   [ 'NameServer', 'DhcpNameServer' ].each do |key|
                     ns = regif.read_s(key)
                     unless ns.empty?
-                      nameserver.concat(ns.split(/\s+/))
+                      nameserver.concat(ns.split(/[,\s]\s*/))
                       break
                     end
                   end
@@ -141,7 +141,7 @@ else
               slist = reg.read_s("SearchList")
               search << domain unless domain.empty?
               search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/,\s*/))
+              nameserver.concat(ns.split(/[,\s]\s*/))
             end
           end
         rescue Registry::Error