diff -Nru ifupdown-0.7~beta2ubuntu1/debian/changelog ifupdown-0.7~beta2ubuntu2/debian/changelog
--- ifupdown-0.7~beta2ubuntu1/debian/changelog	2012-01-12 16:35:41.000000000 +0000
+++ ifupdown-0.7~beta2ubuntu2/debian/changelog	2012-01-16 22:54:27.000000000 +0000
@@ -1,3 +1,14 @@
+ifupdown (0.7~beta2ubuntu2) precise; urgency=low
+
+  * Make sure we always call dhclient(3) with /var/lib/dhcp instead of
+    /var/lib/dhcp3 (needed as dhclient3 is now a symlink to dhclient).
+    (LP: #900234)
+  * Fix typo in previous changelog entry (LP: #916263)
+  * Automatically convert network-interface-security.conf to a conffile
+    (LP: #917185)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 16 Jan 2012 17:54:26 -0500
+
 ifupdown (0.7~beta2ubuntu1) precise; urgency=low
 
   * Resynchronise with Debian experimental.  Remaining changes
@@ -32,7 +43,7 @@
       maverick, add extra handling to avoid spurious conffile prompts.
     - invoke dhclient3 with '-1', meaning it should exit failure if it does
       not receive a response in 60 seconds. (LP: #838968)
-    - contrib/ifstate-check: Use /run/ntework/ifstate instead of
+    - contrib/ifstate-check: Use /run/network/ifstate instead of
       /etc/network/run/ifstate
     - ifup.8: Update man page to indicate that Ubuntu uses /run
       and that it's always writable as it's a temporary filesystem
diff -Nru ifupdown-0.7~beta2ubuntu1/debian/ifupdown.preinst ifupdown-0.7~beta2ubuntu2/debian/ifupdown.preinst
--- ifupdown-0.7~beta2ubuntu1/debian/ifupdown.preinst	2012-01-09 10:52:55.000000000 +0000
+++ ifupdown-0.7~beta2ubuntu2/debian/ifupdown.preinst	2012-01-16 22:05:55.000000000 +0000
@@ -29,7 +29,6 @@
 		1508668168bca783524789c4c87e28e2
 	config_to_conffile /etc/init/network-interface.conf \
 		af7f31fee8f6192cae0518454ac2154b
-
 fi
 
 if dpkg --compare-versions "$2" lt 0.6.9; then
@@ -37,4 +36,9 @@
 		8af8451b188d626e6e7ea92c90d7d64f
 fi
 
+if dpkg --compare-versions "$2" lt 0.7~beta2ubuntu1; then
+	config_to_conffile /etc/init/network-interface-security.conf \
+		04449b8f4a377f06cab083dce987ae95
+fi
+
 #DEBHELPER#
diff -Nru ifupdown-0.7~beta2ubuntu1/ifupdown.nw ifupdown-0.7~beta2ubuntu2/ifupdown.nw
--- ifupdown-0.7~beta2ubuntu1/ifupdown.nw	2012-01-12 13:47:23.000000000 +0000
+++ ifupdown-0.7~beta2ubuntu2/ifupdown.nw	2012-01-16 15:45:38.000000000 +0000
@@ -4625,7 +4625,7 @@
         elsif (execable("/sbin/dhcpcd"))
 
   down
-    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
+    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient3"))
     dhclient -v -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient"))
@@ -5085,7 +5085,7 @@
 
   up
     [[ifconfig %iface% link %hwaddress%]]
-    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
+    dhclient3 -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient3"))
     dhclient -v -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient"))
@@ -5097,7 +5097,7 @@
         elsif (execable("/sbin/dhcpcd"))
 
   down
-    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
+    dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         if (execable("/sbin/dhclient3"))
     dhclient -v -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases %iface% \
         elsif (execable("/sbin/dhclient"))