diff -Nru ntp-4.2.6.p5+dfsg/debian/changelog ntp-4.2.6.p5+dfsg/debian/changelog
--- ntp-4.2.6.p5+dfsg/debian/changelog	2013-10-09 13:28:06.000000000 -0400
+++ ntp-4.2.6.p5+dfsg/debian/changelog	2014-09-11 10:47:37.000000000 -0400
@@ -1,3 +1,9 @@
+ntp (1:4.2.6.p5+dfsg-3ubuntu3) utopic; urgency=medium
+
+  * debian/ntpdate-debian: Prefers dhcp provided NTP servers if one is found (LP: #1257082)
+
+ -- Jorge Niedbalski <jorge.niedbalski@canonical.com>  Thu, 11 Sep 2014 10:46:55 -0400
+
 ntp (1:4.2.6.p5+dfsg-3ubuntu2) saucy; urgency=low
 
   * debian/apparmor-profile: fix spurious noisy denials (LP: #1237508)
diff -Nru ntp-4.2.6.p5+dfsg/debian/ntpdate-debian ntp-4.2.6.p5+dfsg/debian/ntpdate-debian
--- ntp-4.2.6.p5+dfsg/debian/ntpdate-debian	2013-04-03 03:38:53.000000000 -0400
+++ ntp-4.2.6.p5+dfsg/debian/ntpdate-debian	2014-09-11 10:46:53.000000000 -0400
@@ -6,6 +6,10 @@
 	. /etc/default/ntpdate
 fi
 
+if [ -r /var/lib/ntpdate/default.dhcp ]; then
+	. /var/lib/ntpdate/default.dhcp
+fi
+
 if [ "$NTPDATE_USE_NTP_CONF" = yes ]; then
 	for f in /var/lib/ntp/ntp.conf.dhcp /etc/ntp.conf /etc/openntpd/ntpd.conf; do
 		if [ -r "$f" ] && [ -s "$f" ]; then
@@ -16,8 +20,6 @@
 	if [ -n "$file" ]; then
 		NTPSERVERS=$(sed -rne 's/^(servers?|peer)[[:space:]]+(-[46][[:space:]]+)?([-_.:[:alnum:]]+).*$/\3/p' "$file" | grep -v '^127\.127\.') || [ $? -le 1 ]
 	fi
-elif [ -r /var/lib/ntpdate/default.dhcp ]; then
-	. /var/lib/ntpdate/default.dhcp
 fi
 
 exec /usr/sbin/ntpdate $NTPOPTIONS "$@" $NTPSERVERS