diff --git a/debian/changelog b/debian/changelog
index 72bc0808..4542ec46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ livecd-rootfs (2.248) UNRELEASED; urgency=medium
 
   * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
     resolv.conf for Ubuntu Core. 
+  * live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot:
+    Configure system-image-cli's client.ini for Ubuntu Core. This can be
+    dropped once bug 1373467 is fixed.
 
  -- James Hunt <james.hunt@ubuntu.com>  Fri, 26 Sep 2014 15:33:45 +0100
 
diff --git a/live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot b/live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot
new file mode 100755
index 00000000..130ad28b
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot
@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+# Change default cache partition (until LP: #1373467 is fixed).
+if [ -f /etc/system-image/client.ini ]; then
+	sed -ie 's!cache_partition: /android/cache/recovery!cache_partition: /userdata/cache!g' \
+			/etc/system-image/client.ini
+fi