diff --git a/dhcp-3.0.3-dhclient-nis-01-thoenig.patch b/dhcp-3.0.3-dhclient-nis-01-thoenig.patch
deleted file mode 100644
index 8b0aa99..0000000
--- a/dhcp-3.0.3-dhclient-nis-01-thoenig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dhcp-3.0.3/client/dhclient.conf	2006-01-13 22:24:01.000000000 +0100
-+++ dhcp-3.0.3/client/dhclient.conf	2006-01-13 22:22:46.000000000 +0100
-@@ -24,7 +24,8 @@
- 
- send dhcp-lease-time 3600;
- request subnet-mask, broadcast-address, time-offset, routers,
--	domain-name, domain-name-servers, host-name;
-+	domain-name, domain-name-servers, host-name, nis-domain,
-+	nis-servers;
- require subnet-mask, domain-name-servers;
- timeout 60;
- retry 60;
diff --git a/dhcp-3.0.5-dhclient-nis-ntp.patch b/dhcp-3.0.5-dhclient-nis-ntp.patch
new file mode 100644
index 0000000..9d6e5f0
--- /dev/null
+++ b/dhcp-3.0.5-dhclient-nis-ntp.patch
@@ -0,0 +1,17 @@
+Author: Timo Hoenig <thoenig at suse dot de>, Lars Mueller <lmuelle at suse dot de>
+Subject: Request NIS and NTP settings by default
+
+Index: dhcp-3.0.5/client/dhclient.conf
+===================================================================
+--- dhcp-3.0.5.orig/client/dhclient.conf
++++ dhcp-3.0.5/client/dhclient.conf
+@@ -24,7 +24,8 @@
+ 
+ send dhcp-lease-time 3600;
+ request subnet-mask, broadcast-address, time-offset, routers,
+-	domain-name, domain-name-servers, host-name;
++	domain-name, domain-name-servers, host-name, nis-domain,
++	nis-servers, ntp-servers;
+ require subnet-mask, domain-name-servers;
+ timeout 60;
+ retry 60;
diff --git a/dhcp.changes b/dhcp.changes
index a793a62..88c3a1f 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 27 12:27:47 CEST 2007 - lmuelle@suse.de
+
+- Let dhclient request ntp-servers by default.
+
 -------------------------------------------------------------------
 Tue May 22 09:37:59 CEST 2007 - mt@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index fa85f43..df72ca5 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -23,7 +23,7 @@ License:        BSD License and BSD-like
 Group:          Productivity/Networking/Boot/Servers
 Autoreqprov:    on
 Version:        3.0.5
-Release:        37
+Release:        47
 Summary:        Common Files Used by ISC DHCP Software
 URL:            http://www.isc.org/isc/dhcp.html
 Source0:        http://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -80,7 +80,7 @@ Patch70:        dhcp-3.0.3b1-pie.dif
 # Add support for dhcdbd
 Patch80:        dhcp-3.0.2-extended_option_environment.patch
 Patch81:        dhcp-3.0.3-dhclient-script-dhcdbd.patch
-Patch83:        dhcp-3.0.3-dhclient-nis-01-thoenig.patch
+Patch83:        dhcp-3.0.5-dhclient-nis-ntp.patch
 Patch84:        dhcp-send-hostname-rml.patch
 Obsoletes:      dhcp-base
 Provides:       dhcp-base:/usr/bin/omshell
@@ -519,6 +519,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %doc %{_mandir}/man3/dhcpctl.3.gz
 
 %changelog
+* Wed Jun 27 2007 - lmuelle@suse.de
+- Let dhclient request ntp-servers by default.
 * Tue May 22 2007 - mt@suse.de
 - Bug 275592: Added ldap and ndsd to the Should-Start/Stop LSB
   init info tags of the dhcp-server init script.