diff --git a/dhcp-4.1.1-invalid-dhclient-conf.patch b/dhcp-4.1.1-invalid-dhclient-conf.patch
index a547ec3..579d7f0 100644
--- a/dhcp-4.1.1-invalid-dhclient-conf.patch
+++ b/dhcp-4.1.1-invalid-dhclient-conf.patch
@@ -6,7 +6,7 @@ diff -up dhcp-4.1.1/client/dhclient.conf.supersede dhcp-4.1.1/client/dhclient.co
  send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
  send dhcp-lease-time 3600;
 -supersede domain-name "fugue.com home.vix.com";
-+supersede domain-search "fugue.com home.vix.com";
++supersede domain-search "fugue.com", "home.vix.com";
  prepend domain-name-servers 127.0.0.1;
  request subnet-mask, broadcast-address, time-offset, routers,
 -	domain-name, domain-name-servers, host-name;
diff --git a/dhcp-4.1.1-manpages.patch b/dhcp-4.1.1-manpages.patch
index 61cb06c..965dd62 100644
--- a/dhcp-4.1.1-manpages.patch
+++ b/dhcp-4.1.1-manpages.patch
@@ -477,7 +477,13 @@ diff -up dhcp-4.1.1/client/dhclient.conf.5.man dhcp-4.1.1/client/dhclient.conf.5
  .PP
  In some cases, it may be desirable to send no parameter request list
  at all.   To do this, simply write the request statement but specify
-@@ -239,17 +240,6 @@ than the default requested lease time, w
+@@ -234,22 +235,11 @@ The send statement causes the client to 
+ the server with the specified values.  These are full option
+ declarations as described in \fBdhcp-options(5)\fR.  Options that are
+ always sent in the DHCP protocol should not be specified here, except
+-that the client can specify a \fBrequested-lease-time\fR option other
++that the client can specify a requested \fBdhcp-lease-time\fR option other
+ than the default requested lease time, which is two hours.  The other
  obvious use for this statement is to send information to the server
  that will allow it to differentiate between this client and other
  clients or kinds of clients.
@@ -519,7 +525,7 @@ diff -up dhcp-4.1.1/client/dhclient.conf.5.man dhcp-4.1.1/client/dhclient.conf.5
      send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
      send dhcp-lease-time 3600;
 -    supersede domain-name "fugue.com rc.vix.com home.vix.com";
-+    supersede domain-search "fugue.com rc.vix.com home.vix.com";
++    supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
      prepend domain-name-servers 127.0.0.1;
      request subnet-mask, broadcast-address, time-offset, routers,
 -	    domain-name, domain-name-servers, host-name;
diff --git a/dhcp.spec b/dhcp.spec
index 698b13e..a3bba85 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}
-Release:  15%{?dist}
+Release:  16%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -466,9 +466,6 @@ fi
 %config(noreplace) %{dhcpconfdir}/dhcpd.conf
 %config(noreplace) %{dhcpconfdir}/dhcpd6.conf
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/10-dhclient
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcpd6
 %{_initrddir}/dhcrelay
@@ -489,6 +486,9 @@ fi
 %attr(0750,root,root) %dir %{dhcpconfdir}
 %dir %{dhcpconfdir}/dhclient.d
 %dir %{_localstatedir}/lib/dhclient
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%{_sysconfdir}/NetworkManager/dispatcher.d/10-dhclient
 /sbin/dhclient
 /sbin/dhclient-script
 %attr(0755,root,root) %{_libdir}/pm-utils/sleep.d/56dhclient
@@ -511,6 +511,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Apr 28 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-16
+- Move /etc/NetworkManager/dispatcher.d/10-dhclient script
+  from dhcp to dhclient subpackage (#586999).
+
 * Wed Apr 21 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-15
 - If the Reply was received in response to Renew or Rebind message,
   client adds any new addresses in the IA option to the IA (#578097)