diff -Nru systemd-230/debian/changelog systemd-230/debian/changelog
--- systemd-230/debian/changelog	2016-05-31 11:02:19.000000000 +0100
+++ systemd-230/debian/changelog	2016-06-01 10:10:56.000000000 +0100
@@ -1,3 +1,11 @@
+systemd (230-2ubuntu1) yakkety; urgency=low
+
+  * Fix resolvconf handling (LP: #1587762):
+    - Do not apply resolvconf updates when using resolved.
+    - Do not publish DNS servers with domain routing to resolvconf.
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Wed, 01 Jun 2016 10:09:12 +0100
+
 systemd (230-2) unstable; urgency=medium
 
   [ Martin Pitt ]
diff -Nru systemd-230/debian/extra/units/systemd-networkd-resolvconf-update.service systemd-230/debian/extra/units/systemd-networkd-resolvconf-update.service
--- systemd-230/debian/extra/units/systemd-networkd-resolvconf-update.service	2016-05-31 11:02:19.000000000 +0100
+++ systemd-230/debian/extra/units/systemd-networkd-resolvconf-update.service	2016-06-01 10:02:21.000000000 +0100
@@ -2,11 +2,12 @@
 Description=Update resolvconf for networkd DNS
 ConditionPathIsSymbolicLink=/etc/resolv.conf
 ConditionPathExists=/run/resolvconf/enable-updates
+ConditionPathExists=!/run/systemd/resolve
 After=resolvconf.service
 
 [Service]
 Type=oneshot
 StartLimitBurst=20
 # we might be triggered several times in short succession during restarting networkd, so wait until we get a DNS entry
-ExecStart=/bin/sh -c 'for timeout in `seq 30`; do out=$(sed -n "/^DNS=/ { s/^DNS=/nameserver /; p}" /run/systemd/netif/state); [ -z "$out" ] || break; sleep 1; done; echo "$out" | /sbin/resolvconf -a networkd'
+ExecStart=/bin/sh -c 'for timeout in `seq 30`; do out=$(for link in /run/systemd/netif/links/*; do awk -F= '/^DNS=/ { dns=dns "network " $2 "\n" } /^ROUTE_DOMAINS=/ { routable=1 } END { if (routable != 1) { print dns } }' "$link"; done); [ -z "$out" ] || break; sleep 1; done; echo "$out" | /sbin/resolvconf -a networkd'