diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/changelog isc-dhcp-4.2.2.dfsg.1/debian/changelog
--- isc-dhcp-4.2.2.dfsg.1/debian/changelog	2012-10-14 22:04:44.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/changelog	2013-02-16 20:41:00.000000000 +0000
@@ -1,3 +1,15 @@
+isc-dhcp (4.2.2.dfsg.1-5+deb70u3) testing-proposed-updates; urgency=medium
+
+  * Run exit hooks when "dhclient -1" fails (closes: #486520).
+  * Add dhcp6.name-servers and dhcp6.domain-search to the default request
+    options in dhclient.conf (closes: #693315).
+  * Handle dhclient.conf left behind during a prior lenny->squeeze upgrade,
+    upgrade it now to avoid an unnecessary conffile prompt (closes: #698582).
+    - Thanks to Gregor Herrmann for the patch.
+  * Also, do not copy dhclient.conf from /etc/dhcp3 anymore (closes: #700363).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sat, 16 Feb 2013 20:40:46 +0000
+
 isc-dhcp (4.2.2.dfsg.1-5+deb70u2) testing-proposed-updates; urgency=high
 
   * Non-maintainer upload by the Security Team.
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/dhclient.conf isc-dhcp-4.2.2.dfsg.1/debian/dhclient.conf
--- isc-dhcp-4.2.2.dfsg.1/debian/dhclient.conf	2012-09-14 03:24:53.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/dhclient.conf	2013-02-16 20:40:20.000000000 +0000
@@ -21,6 +21,7 @@
 #prepend domain-name-servers 127.0.0.1;
 request subnet-mask, broadcast-address, time-offset, routers,
 	domain-name, domain-name-servers, domain-search, host-name,
+	dhcp6.name-servers, dhcp6.domain-search,
 	netbios-name-servers, netbios-scope, interface-mtu,
 	rfc3442-classless-static-routes, ntp-servers;
 #require subnet-mask, domain-name-servers;
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.postinst isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.postinst
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.postinst	2012-09-14 03:24:53.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.postinst	2013-02-16 20:40:26.000000000 +0000
@@ -17,12 +17,6 @@
             fi
         fi
 
-	if [ -z "$2" ]; then
-		if [ -e /etc/dhcp3/dhclient.conf ]; then
-			cp /etc/dhcp3/dhclient.conf /etc/dhcp/dhclient.conf
-		fi
-	fi
-
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst
--- isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst	2012-09-14 03:24:53.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/isc-dhcp-client.preinst	2013-02-16 20:40:26.000000000 +0000
@@ -15,6 +15,13 @@
 		cp /etc/dhclient.conf /etc/dhcp3/dhclient.conf.oldconfig
         fi
 
+	# handle lingering dhclient.conf from lenny (this can be safely removed
+	# after the wheezy release)
+	if [ -e /etc/dhcp/dhclient.conf ] && \
+		[ "`md5sum /etc/dhcp/dhclient.conf  | awk '{print $1;}'`" = 6e3910d75cd5cde0042ecb6d48492ae9 ]; then
+		sed -i -e 's/rfc3442-classless-static-routes;/rfc3442-classless-static-routes, ntp-servers;/' /etc/dhcp/dhclient.conf
+	fi
+
 	# We renamed debug-enter to debug - handle the transition
 	if [ ! -e /etc/dhcp3/dhclient-enter-hooks.d/debug ] && \
 	      [ -e /etc/dhcp3/dhclient-enter-hooks.d/debug-enter ]; then
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/patches/dhclient-exit-hook.patch isc-dhcp-4.2.2.dfsg.1/debian/patches/dhclient-exit-hook.patch
--- isc-dhcp-4.2.2.dfsg.1/debian/patches/dhclient-exit-hook.patch	1970-01-01 00:00:00.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/patches/dhclient-exit-hook.patch	2013-02-16 20:40:20.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Run exit hooks when "dhclient -1" fails (closes: #486520).
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/486520
+Index: isc-dhcp-4.2.2.dfsg.1/client/dhclient.c
+===================================================================
+--- isc-dhcp-4.2.2.dfsg.1.orig/client/dhclient.c	2012-12-25 15:00:44.030394263 +0000
++++ isc-dhcp-4.2.2.dfsg.1/client/dhclient.c	2012-12-25 15:00:44.198394269 +0000
+@@ -2015,6 +2015,8 @@
+ 		if (!quiet)
+ 			log_info ("Unable to obtain a lease on first try.%s",
+ 				  "  Exiting.");
++		script_init (client, "FAIL", (struct string_list *)0);
++		script_go (client);
+ 		exit (2);
+ 	}
+ 
diff -Nru isc-dhcp-4.2.2.dfsg.1/debian/patches/series isc-dhcp-4.2.2.dfsg.1/debian/patches/series
--- isc-dhcp-4.2.2.dfsg.1/debian/patches/series	2012-09-17 21:48:31.000000000 +0000
+++ isc-dhcp-4.2.2.dfsg.1/debian/patches/series	2013-02-16 20:40:20.000000000 +0000
@@ -8,3 +8,4 @@
 cve-2012-3571.patch
 cve-2012-3954.patch
 cve-2012-3955.patch
+dhclient-exit-hook.patch