diff --git a/config b/config
index c7d2792..59a292d 100644
--- a/config
+++ b/config
@@ -12,16 +12,16 @@
 # If you do not need booting from CD (eg you're booting only from USB)
 # then you can ignore recompiling isolinux.bin, just rename LIVEKITNAME
 # and you're done.
-LIVEKITNAME="linux"
+LIVEKITNAME="briq"
+
+# Kernel version. Change it to "3.2.28" for example, if you are building
+# Live Kit with a different kernel than the one you are actually running
+KERNEL=$BRIQ_KERNEL_NAME
 
 # Kernel file, will be copied to your Live Kit
 # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready
 # out of the box.
-VMLINUZ=/vmlinuz
-
-# Kernel version. Change it to "3.2.28" for example, if you are building
-# Live Kit with a different kernel than the one you are actually running
-KERNEL=$(uname -r)
+VMLINUZ="/vmlinuz-$KERNEL"
 
 # List of directories for root filesystem
 # No subdirectories are allowed, no slashes,
diff --git a/initramfs/initramfs_create b/initramfs/initramfs_create
index 6ecb5bd..066f4f0 100755
--- a/initramfs/initramfs_create
+++ b/initramfs/initramfs_create
@@ -127,10 +127,11 @@ copy_including_deps /$LMK/modules.*
 
 
 find $INITRAMFS -name "*.ko.gz" -exec gunzip {} \;
+find $INITRAMFS -name "*.ko.xz" -exec unxz {} \;
 
 # trim modules.order file. Perhaps we could remove it entirely
 MODULEORDER="$(cd "$INITRAMFS/$LMK/"; find -name "*.ko" | sed -r "s:^./::g" | tr "\n" "|" | sed -r "s:[.]:.:g")"
-cat $INITRAMFS/$LMK/modules.order | sed -r "s/.ko.gz\$/.ko/" | grep -E "$MODULEORDER"/foo/bar > $INITRAMFS/$LMK/_
+cat $INITRAMFS/$LMK/modules.order | sed -r "s/.ko..z\$/.ko/" | grep -E "$MODULEORDER"/foo/bar > $INITRAMFS/$LMK/_
 mv $INITRAMFS/$LMK/_ $INITRAMFS/$LMK/modules.order
 
 depmod -b $INITRAMFS $KERNEL