diff --git a/ChangeLog b/ChangeLog
index 21b29b8c5f..9e45e477cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
+
+        * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
+          domain and search directive without an argument.
+	  reported by Sam Roberts.  [ruby-talk:126781]
+
 Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value 
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 069cf5c8f1..84b0d0f10f 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -734,8 +734,10 @@ class Resolv
             when 'nameserver'
               nameserver += args
             when 'domain'
+              next if args.empty?
               search = [args[0]]
             when 'search'
+              next if args.empty?
               search = args
             end
           }