diff -Nru ntp-4.2.6.p2+dfsg/debian/changelog ntp-4.2.6.p2+dfsg/debian/changelog
--- ntp-4.2.6.p2+dfsg/debian/changelog	2011-03-10 20:55:23.000000000 +0000
+++ ntp-4.2.6.p2+dfsg/debian/changelog	2011-06-13 15:44:37.000000000 +0100
@@ -1,3 +1,12 @@
+ntp (1:4.2.6.p2+dfsg-1ubuntu5.1) natty-proposed; urgency=low
+
+  * debian/patches/ntpdate-accept-same-timestamp-replies.patch:
+    Resolving regression where ntpdate ignores replies from some
+    ntp servers where recieve and transmit timestamps are equal.
+    Patch cherry picked from upstream commit. (LP: #787551)
+
+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com>  Mon, 13 Jun 2011 15:43:57 +0100
+
 ntp (1:4.2.6.p2+dfsg-1ubuntu5) natty; urgency=low
 
   * debian/apparmor-profile: add note about using shared memory for
diff -Nru ntp-4.2.6.p2+dfsg/debian/patches/ntpdate-accept-same-timestamp-replies.patch ntp-4.2.6.p2+dfsg/debian/patches/ntpdate-accept-same-timestamp-replies.patch
--- ntp-4.2.6.p2+dfsg/debian/patches/ntpdate-accept-same-timestamp-replies.patch	1970-01-01 01:00:00.000000000 +0100
+++ ntp-4.2.6.p2+dfsg/debian/patches/ntpdate-accept-same-timestamp-replies.patch	2011-06-13 15:43:14.000000000 +0100
@@ -0,0 +1,21 @@
+Description:  Resolving regression where ntpdate ignores replies 
+ from some ntp servers where recieve and transmit timestamps are 
+ equal. Patch cherry picked from upstream commit.
+Origin: upstream, http://ntp.bkbits.net:8080/ntp-stable/?PAGE=gnupatch&REV=1.2225.3.1
+Author: Dave Hart <davehart@hartbrothers.com>
+Bug: http://bugs.ntp.org/1709
+Bug-Ubuntu: https://launchpad.net/bugs/787551 
+Bug-Debian: http://bugs.debian.org/599793
+
+--- a/ntpdate/ntpdate.c
++++ b/ntpdate/ntpdate.c
+@@ -868,8 +868,7 @@
+ 	 * Make sure the server is at least somewhat sane.	If not, try
+ 	 * again.
+ 	 */
+-	if (L_ISZERO(&rec) || !L_ISHIS(&server->org, &rec)
+-	    || L_ISEQU(&rec, &server->org)) {
++	if (L_ISZERO(&rec) || !L_ISHIS(&server->org, &rec)) {
+ 		server->event_time = current_time + sys_timeout;
+ 		return;
+ 	}
diff -Nru ntp-4.2.6.p2+dfsg/debian/patches/series ntp-4.2.6.p2+dfsg/debian/patches/series
--- ntp-4.2.6.p2+dfsg/debian/patches/series	2010-11-30 15:58:37.000000000 +0000
+++ ntp-4.2.6.p2+dfsg/debian/patches/series	2011-06-13 15:43:24.000000000 +0100
@@ -9,3 +9,4 @@
 autotools.patch
 mod_nano.patch
 nanokernel-status.patch
+ntpdate-accept-same-timestamp-replies.patch