diff -Nru systemd-204/debian/changelog systemd-204/debian/changelog
--- systemd-204/debian/changelog	2015-11-16 21:33:50.000000000 +0000
+++ systemd-204/debian/changelog	2016-01-26 07:40:16.000000000 +0000
@@ -1,17 +1,12 @@
-systemd (204-5ubuntu20.17) trusty-proposed; urgency=medium
+systemd (204-5ubuntu20.18) trusty-proposed; urgency=medium
 
-  * debian/patches/avocent-sc-secure-kvm.patch: Soften assignment rule to
-    pass the package syntax checker.
+  * debian/udev-udeb.install: Ship persistent net generator rules, so that the
+    naming from the d-i environment gets copied into the installed system (via
+    base-installer.d/05udev d-i hook, which already is shipped). With that a
+    d-i generated /etc/network/interfaces will still be valid in the installed
+    system. (LP: #1537136)
 
- -- Bryce Harrington <bryce@ubuntu.com>  Mon, 16 Nov 2015 13:33:13 -0800
-
-systemd (204-5ubuntu20.16) trusty-proposed; urgency=medium
-
-  * debian/patches/avocent-sc-secure-kvm.patch: Disable USB autosuspend
-    for the Avocent SC Secure KVM.
-    (LP: #1371403)
-
- -- Bryce Harrington <bryce@ubuntu.com>  Thu, 22 Oct 2015 13:39:41 -0700
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 25 Jan 2016 15:03:51 +0100
 
 systemd (204-5ubuntu20.15) trusty; urgency=medium
 
diff -Nru systemd-204/debian/patches/avocent-sc-secure-kvm.patch systemd-204/debian/patches/avocent-sc-secure-kvm.patch
--- systemd-204/debian/patches/avocent-sc-secure-kvm.patch	2015-11-16 21:27:55.000000000 +0000
+++ systemd-204/debian/patches/avocent-sc-secure-kvm.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
---- a/rules/42-usb-hid-pm.rules
-+++ b/rules/42-usb-hid-pm.rules
-@@ -15,6 +15,9 @@
- # trigger on HID class devices.
- ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{bInterfaceClass}=="03", TEST=="../power/control", ATTR{../power/control}="auto"
- 
-+# Avocent SC Secure KVM should not autosuspend (LP: #1371403)
-+ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{idProduct}=="0013", ATTR{product}=="SC Secure KVM", TEST=="power/control", ATTR{power/control}="on"
-+
- # Dell DRAC 4
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto"
- 
diff -Nru systemd-204/debian/patches/series systemd-204/debian/patches/series
--- systemd-204/debian/patches/series	2015-10-22 20:38:57.000000000 +0000
+++ systemd-204/debian/patches/series	2015-07-08 17:36:14.000000000 +0000
@@ -28,4 +28,3 @@
 add-cgmanager-support
 Advertise-hibernation-only-if-there-s-enough-free-sw.patch
 ProLiant-power-button.patch
-avocent-sc-secure-kvm.patch
diff -Nru systemd-204/debian/udev-udeb.install systemd-204/debian/udev-udeb.install
--- systemd-204/debian/udev-udeb.install	2014-05-07 12:59:51.000000000 +0000
+++ systemd-204/debian/udev-udeb.install	2016-01-26 07:39:43.000000000 +0000
@@ -12,3 +12,4 @@
 lib/udev/rules.d/75-probe_mtd.rules
 lib/udev/rules.d/80-drivers.rules
 ../../extra/rules/73-idrac.rules lib/udev/rules.d/
+../../extra/rules/75-persistent-net-generator.rules lib/udev/rules.d/