diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
index 4f0698674321f4f55aa32ba2557c3df601670395..aa9d92e7a41f38890c5d54c48a921ba794d5c897 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
@@ -46,6 +46,7 @@ function install_libnsa()
         cp "$SCRIPT_DIR/libnsa/libnsa.desktop" "$IRD/lip/libnsa"
         cp "$SCRIPT_DIR/libnsa/libnsa.sh" "$IRD/lip/libnsa"
         cp "$SCRIPT_DIR/libnsa/26libnsa" "$IRD/scripts/casper-bottom/"
+        chmod +x "$IRD/lip/libnsa/libnsa.sh"
         chmod +x "$IRD/scripts/casper-bottom/26libnsa"
 }
 
@@ -53,7 +54,7 @@ function add_no_bootloader_icon()
 {
 	mkdir -p "$IRD/lip/no-bootloader-icon"
 	cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-kdeui.desktop" "$IRD/lip/no-bootloader-icon/"
-	cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
+#	cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
 
 	cp "$SCRIPT_DIR/no-bootloader-icon/25adduser" "$IRD/scripts/casper-bottom/"
 	chmod +x "$IRD/scripts/casper-bottom/25adduser"
@@ -61,7 +62,7 @@ function add_no_bootloader_icon()
 
 mkdir -p "$IRD/lip"
 install_nmtelekinese
-install_libnsa
+#install_libnsa
 add_no_bootloader_icon
 
 #copy custom lip hook
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh
old mode 100644
new mode 100755
index 6ea1548cedbb75a779af6e4c04d6fa01d087205c..74f4fa8f4c80584f1a69a0a6b513405addc5e8b8
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-DUMPDIR="$(mktemp -d --tmp-dir /cdrom/lipstats/ .stats.XXXXXXXXXXXX)"
+DUMPDIR="$(mktemp -d --tmpdir /cdrom/lipstats/ .stats.XXXXXXXXXXXX)"
 
 mkdir -p "$DUMPDIR"
 
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui-no-bootloader.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui-no-bootloader.desktop
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-kdeui-no-bootloader.desktop
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-kdeui.desktop
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubuquity-kdeui.desktop
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-kdeui.desktop
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/remaster_initrd_standalone.sh b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/remaster_initrd_standalone.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a29b25d498ba15bbc0eaa3241fe8947671833a4c
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/remaster_initrd_standalone.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -e
+WORKDIR="$(pwd)"
+
+function unpack_initrd
+{
+    FILE="$1"
+    FOLDER="$2"
+    mkdir -p "$FOLDER/remaster-initrd"
+    pushd "$FOLDER/remaster-initrd" > /dev/null
+    lzma -d < "$FILE" | cpio -i
+    popd > /dev/null
+}
+
+function pack_initrd
+{
+    OUTDIR="$1"
+    INDIR="$2"
+    if [ ! -d "$INDIR/remaster-initrd" ]; then
+        echo "Temp directory does not exist. Bug?"
+        exit 1
+    fi
+    pushd "$INDIR/remaster-initrd" > /dev/null
+    find | cpio -H newc -o | lzma -z > "$OUTDIR/initrd.lz"
+    popd > /dev/null
+}
+
+if [ $# -eq 0 ]; then
+    echo "Usage: $0 INITRD_FILE PATH_TO_CUSTOMIZE_LIP"
+    exit 1
+fi
+
+INITRD_FILE="$1"
+PATH_TO_CUSTOMIZE_LIP="$2"
+
+if [ ! -f "$INITRD_FILE" ]; then
+    echo "Initrd file '$INITRD_FILE' not found"
+    exit 1
+fi
+
+if [ ! -d "$PATH_TO_CUSTOMIZE_LIP" ]; then
+    echo "You must specify the path to the customize-lip folder"
+    exit 1
+fi
+
+TMPDIR="$(mktemp -d)"
+
+unpack_initrd "$INITRD_FILE" "$TMPDIR"
+pushd "$PATH_TO_CUSTOMIZE_LIP" > /dev/null
+. $PATH_TO_CUSTOMIZE_LIP/customize_initrd "$TMPDIR"
+popd > /dev/null
+pack_initrd "$WORKDIR" "$TMPDIR"
+echo "Ok, all done"
+exit 0