diff --git a/debian/changelog b/debian/changelog
index 27ef5f33..68c8fcf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.525.12) UNRELEASED; urgency=medium
+
+  * Key netplan delegation to NetworkManager on presence of
+    /usr/sbin/NetworkManager, not on /usr/lib/NetworkManager which may have
+    hooks from other packages (i.e., wpasupplicant).
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 06 Dec 2018 13:47:54 +0200
+
 livecd-rootfs (2.525.11) bionic; urgency=medium
 
   * Backport all the required changes to enable Raspberry Pi 3 armhf and arm64
diff --git a/live-build/auto/build b/live-build/auto/build
index 386768c4..7ebfc490 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -415,7 +415,7 @@ EOF
 	# default. Installing NM on an existing system only manages wifi and wwan via
 	# /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting
 	# the global backend to NM, netplan overrides that file.
-	if [ -d chroot/usr/lib/NetworkManager ]; then
+	if [ -e chroot/usr/sbin/NetworkManager ]; then
 		echo "===== Enabling all devices in NetworkManager ===="
 		mkdir -p chroot/etc/netplan
 		cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml