diff --git a/debian/changelog b/debian/changelog
index 4e046dfe..7f8ad06e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.305) UNRELEASED; urgency=medium
+
+  * also add /lib/firmware to the dirs we pre-create on touch and core.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 28 May 2015 13:18:43 +0200
+
 livecd-rootfs (2.304) wily; urgency=medium
 
   * -touch/-core create /etc/mtab link, /lib/modules dir and the respective
diff --git a/live-build/ubuntu-core/hooks/20-extra-files.chroot b/live-build/ubuntu-core/hooks/20-extra-files.chroot
index bb5d4987..be28cc12 100755
--- a/live-build/ubuntu-core/hooks/20-extra-files.chroot
+++ b/live-build/ubuntu-core/hooks/20-extra-files.chroot
@@ -5,4 +5,5 @@ set -e
 echo "creating mtab and modules dir" >&2
 ln -sf /proc/mounts /etc/mtab
 mkdir -p /lib/modules
+mkdir -p /lib/firmware
 mkdir -p /writable
diff --git a/live-build/ubuntu-touch/hooks/20-extra-files.chroot b/live-build/ubuntu-touch/hooks/20-extra-files.chroot
index 8a0da9cf..f4a35f28 100755
--- a/live-build/ubuntu-touch/hooks/20-extra-files.chroot
+++ b/live-build/ubuntu-touch/hooks/20-extra-files.chroot
@@ -5,4 +5,5 @@ set -e
 echo "creating mtab and modules dir" >&2
 ln -sf /proc/mounts /etc/mtab
 mkdir -p /lib/modules
+mkdir -p /lib/firmware
 mkdir -p /userdata