diff --git a/ChangeLog b/ChangeLog
index 7482d948ba..62473fd2a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 23 12:43:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/resolv.rb (Config.default_config_hash): when multiple domains
+	  are set, Win32::Resolv.get_resolv_info returns Array.
+
 Sun Aug 22 16:27:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
diff --git a/lib/resolv.rb b/lib/resolv.rb
index d3f441bfc7..069cf5c8f1 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -751,7 +751,7 @@ class Resolv
             search, nameserver = Win32::Resolv.get_resolv_info
             config_hash = {}
             config_hash[:nameserver] = nameserver if nameserver
-            config_hash[:search] = [search] if search
+            config_hash[:search] = [search].flatten if search
           end
         end
         config_hash