diff --git a/debian/changelog b/debian/changelog
index 70b74dfd..418320cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.256) UNRELEASED; urgency=medium
+
+  * Fix directory layout of custom tarball.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 15 Oct 2014 17:11:58 +0100
+
 livecd-rootfs (2.255) utopic; urgency=medium
 
   [ Steve Langasek ]
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.binary b/live-build/ubuntu-touch/hooks/60-install-click.binary
index c57b372e..25b1d71a 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.binary
+++ b/live-build/ubuntu-touch/hooks/60-install-click.binary
@@ -5,5 +5,5 @@ set -e
 echo "Splitting out custom tarball"
 
 rm -f binary/boot/custom.dir
-mkdir binary/boot/custom.dir
-mv binary/boot/filesystem.dir/custom binary/boot/custom.dir/custom
+mkdir -p binary/boot/custom.dir/system
+mv binary/boot/filesystem.dir/custom binary/boot/custom.dir/system/custom