diff --git a/.config b/.config
index 38e2d75..03240e1 100644
--- a/.config
+++ b/.config
@@ -9,13 +9,13 @@
 # in order to update isolinux.bin for CD booting.
 LIVEKITNAME="mylinux"
 
-# Kernel file, will be copied to your Live Kit
-VMLINUZ=/boot/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)
 
+# Kernel file, will be copied to your Live Kit
+VMLINUZ=/boot/vmlinuz-"$KERNEL"
+
 # List of directories which will be modularized
 # No subdirectories are allowed, no slashes,
 # so You can't use /var/tmp here for example
@@ -26,7 +26,7 @@ MKMOD="bin etc home lib lib64 opt root sbin srv usr var"
 EXCLUDE="/etc/fstab /etc/mtab"
 
 # Temporary directory to store livekit filesystem
-LIVEKITDATA=/tmp/$LIVEKITNAME-data-$$
+LIVEKITDATA=$(mktemp -d "/tmp/$LIVEKITNAME-data.XXXXXX")
 
 # Bundle extension, for example 'sb' for .sb extension
 BEXT=sb