diff --git a/debian/changelog b/debian/changelog
index 210bd785..62470a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.238) utopic; urgency=medium
+
+  * ubuntu-core: Fix build failure due to missing /etc/default/grub and
+    provide an fstab that will make systemd happy.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 05 Aug 2014 11:32:44 -0400
+
 livecd-rootfs (2.237) utopic; urgency=medium
 
   * ubuntu-core: Add click-systemd to preinstalled image (currently only in
diff --git a/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot b/live-build/ubuntu-core/hooks/03-boot_with_systemd.binary
similarity index 88%
rename from live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot
rename to live-build/ubuntu-core/hooks/03-boot_with_systemd.binary
index 563af73e..9c5e4a8c 100755
--- a/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot
+++ b/live-build/ubuntu-core/hooks/03-boot_with_systemd.binary
@@ -3,7 +3,7 @@
 # Boot using systemd and disable quiet boot
 # to see what is happening.
 systemd=/lib/systemd/systemd
-sed -i \
+[ -f /etc/default/grub ] && sed -i \
     -e "s,^\\([ 	]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \
     -e 's,^\([ 	]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \
     /etc/default/grub
diff --git a/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
new file mode 100755
index 00000000..461c752f
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/05-create_minimal_fstab.chroot
@@ -0,0 +1,6 @@
+#!/bin/sh -x
+
+cat >>/etc/fstab<<EOT
+# Minimal setup required for systemd to provide a r/w FS
+/dev/root	/	rootfs	defaults	0	0
+EOT