diff -Nru dhcp-3.1.2p1/client/scripts/bsdos /tmp/dhcp-3.1.2p1-mw/client/scripts/bsdos
--- dhcp-3.1.2p1/client/scripts/bsdos	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/bsdos	2009-10-21 10:34:49.000000000 +0200
@@ -4,7 +4,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do
diff -Nru dhcp-3.1.2p1/client/scripts/freebsd /tmp/dhcp-3.1.2p1-mw/client/scripts/freebsd
--- dhcp-3.1.2p1/client/scripts/freebsd	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/freebsd	2009-10-21 10:35:26.000000000 +0200
@@ -14,7 +14,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do
diff -Nru dhcp-3.1.2p1/client/scripts/linux /tmp/dhcp-3.1.2p1-mw/client/scripts/linux
--- dhcp-3.1.2p1/client/scripts/linux	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/linux	2009-10-21 10:36:00.000000000 +0200
@@ -26,7 +26,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do
diff -Nru dhcp-3.1.2p1/client/scripts/netbsd /tmp/dhcp-3.1.2p1-mw/client/scripts/netbsd
--- dhcp-3.1.2p1/client/scripts/netbsd	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/netbsd	2009-10-21 10:36:10.000000000 +0200
@@ -4,7 +4,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do
diff -Nru dhcp-3.1.2p1/client/scripts/openbsd /tmp/dhcp-3.1.2p1-mw/client/scripts/openbsd
--- dhcp-3.1.2p1/client/scripts/openbsd	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/openbsd	2009-10-21 10:36:45.000000000 +0200
@@ -4,7 +4,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do
diff -Nru dhcp-3.1.2p1/client/scripts/solaris /tmp/dhcp-3.1.2p1-mw/client/scripts/solaris
--- dhcp-3.1.2p1/client/scripts/solaris	2009-10-21 10:37:44.000000000 +0200
+++ /tmp/dhcp-3.1.2p1-mw/client/scripts/solaris	2009-10-21 10:36:54.000000000 +0200
@@ -4,7 +4,12 @@
   if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
     if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
       conf="# Generated by dhclient for interface $interface\n"
-      if [ "x$new_domain_name" != x ]; then
+      if [ "x$new_domain_search" != x ]; then
+        if [ "x$new_domain_name" != x ]; then
+          conf="${conf}domain $new_domain_name\n"
+        fi
+        conf="${conf}search $new_domain_search\n"
+      elif [ "x$new_domain_name" != x ]; then
         conf="${conf}search $new_domain_name\n"
       fi
       for nameserver in $new_domain_name_servers; do