diff --git a/debian/changelog b/debian/changelog
index 2f20f367..43c9a356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.348) wily; urgency=medium
+
+  * limit grub-install diversion on snappy images to x86 architectures
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 12:52:57 +0200
+
+livecd-rootfs (2.347) wily; urgency=medium
+
+  * divert grub-install on snappy images during rootfs build
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 12:44:04 +0200
+
 livecd-rootfs (2.346) wily; urgency=medium
 
   * merge lp:~sil2100/livecd-rootfs/remove_apt_lists to drop cruft from
diff --git a/live-build/ubuntu-core/hooks/01-divert-grub-install.chroot_early b/live-build/ubuntu-core/hooks/01-divert-grub-install.chroot_early
new file mode 100755
index 00000000..d6fbd500
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/01-divert-grub-install.chroot_early
@@ -0,0 +1,19 @@
+#!/bin/sh -ex
+
+ARCH=$(dpkg --print-architecture)
+
+case $ARCH in
+    i386|amd64)
+        dpkg-divert --quiet --add \
+                --divert /usr/sbin/grub-install.REAL --rename \
+                /usr/sbin/grub-install
+
+        cat > /usr/sbin/grub-install <<'EOF'
+#! /bin/sh
+echo "grub-install: diverted by livecd-rootfs (will be called later)" >&2
+exit 0
+EOF
+
+        chmod +x /usr/sbin/grub-install
+    ;;
+esac
diff --git a/live-build/ubuntu-core/hooks/99-undivert-grub-install.chroot b/live-build/ubuntu-core/hooks/99-undivert-grub-install.chroot
new file mode 100755
index 00000000..0a88ef39
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/99-undivert-grub-install.chroot
@@ -0,0 +1,10 @@
+#! /bin/sh -ex
+
+ARCH=$(dpkg --print-architecture)
+
+case $ARCH in
+    i386|amd64)
+        rm -f /usr/sbin/grub-install
+        dpkg-divert --quiet --remove --rename /usr/sbin/grub-install
+    ;;
+esac