diff --git a/debian/changelog b/debian/changelog
index 89e62783..ad55cd72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.395) UNRELEASED; urgency=medium
+
+  * create /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg on
+    snappy so we do not end up with broken network config after cloud-init
+    ran (LP: #1563296).
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 01 Apr 2016 16:31:50 +0200
+
 livecd-rootfs (2.394) xenial; urgency=medium
 
   [ Xavi Garcia ]
diff --git a/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot b/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot
new file mode 100755
index 00000000..d6d77f97
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/09-disable-cloud-init-net-breaking.chroot
@@ -0,0 +1,8 @@
+#!/bin/sh -x
+
+[ -d /etc/cloud/cloud.cfg.d ] || mkdir -p /etc/cloud/cloud.cfg.d
+
+cat >> /etc/cloud/cloud.cfg.d/99-snappy-disable-network-config.cfg <<EOF
+network:
+  config: disabled
+EOF