diff --git a/debian/changelog b/debian/changelog
index d3fe1fc3..de64abca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.397) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
+    create a generic initrd inside the snappy os-snap so we do not need the
+    hackish ubuntu-core-generic-initrd package anymore.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 07 Apr 2016 17:21:13 +0200
+
 livecd-rootfs (2.396) xenial; urgency=medium
 
   [ Adam Conrad ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 6783f52a..e377b12a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -401,7 +401,7 @@ case $PROJECT in
 					add_package install u-boot-tools
                                         ;;
 			esac
-			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
+			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
 
 			# contains the framework definition
 			add_package install ubuntu-core-libs
diff --git a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
new file mode 100755
index 00000000..896cfa48
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -ex
+
+IVER="$(dpkg -s initramfs-tools-ubuntu-core | \
+			sed -n '/^Version:/{s/^[^: ]*: \([^: ]*\).*/\1/;p;}')"
+
+# force lzma
+mkdir -p /etc/initramfs-tools/conf.d
+echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf
+
+update-initramfs.REAL -c -kcore-$IVER -v
+
+cd /boot
+ln -s initrd.img-core-$IVER initrd.img-core
+cd -
+
+sha1sum /boot/initrd.img-core >/var/lib/initramfs-tools/core
+
+# for snapcraft backwards compatibility
+mkdir -p /usr/lib/ubuntu-core-generic-initrd
+cp -a /boot/initrd.img-core* /usr/lib/ubuntu-core-generic-initrd/