diff -Nru uck-2.4.7/debian/changelog uck-2.4.7+SNAPSHOT150118192508/debian/changelog
--- uck-2.4.7/debian/changelog	2013-11-19 08:49:38.000000000 +0000
+++ uck-2.4.7+SNAPSHOT150118192508/debian/changelog	2015-01-18 21:35:33.000000000 +0000
@@ -1,3 +1,11 @@
+uck (2.4.7+SNAPSHOT150118192508-0ubuntu1ppa3~trusty) trusty; urgency=low
+
+  [ BigK ]
+  * Fix lp: #1201911
+  * Fix lp: #1325142 
+
+ -- BigK <ocau@free.fr>  Sun, 18 Jan 2015 22:27:34 +0100
+
 uck (2.4.7-0ubuntu1) trusty; urgency=low
 
   [ Jackson Doak ]
diff -Nru uck-2.4.7/libraries/customization-profiles/localized_cd/customize_iso uck-2.4.7+SNAPSHOT150118192508/libraries/customization-profiles/localized_cd/customize_iso
--- uck-2.4.7/libraries/customization-profiles/localized_cd/customize_iso	2012-10-20 20:20:20.000000000 +0000
+++ uck-2.4.7+SNAPSHOT150118192508/libraries/customization-profiles/localized_cd/customize_iso	2015-01-18 18:11:17.000000000 +0000
@@ -127,19 +127,28 @@
 
 # Copy kernel and initrd, in case it was changed during installation
 VMLINUZ=$(get_latest_kernel)
-if [ "$VMLINUZ" != "" ]
+VMLINUZ_EFI="$VMLINUZ".efi.signed
+INITRD="$REMASTER_DIR"/boot/initrd.img-$(echo `basename $VMLINUZ` | cut -d'-' -f 2-)
+if [ -e "$INITRD" ]
 then
-	INITRD="$REMASTER_DIR"/boot/initrd.img-$(echo `basename $VMLINUZ` | cut -d'-' -f 2-)
-	if [ -e "$VMLINUZ" -a -e "$INITRD" ]
+
+	if [ -e "$ISO_REMASTER_DIR/casper/vmlinuz" -a -e "$VMLINUZ" ]
 	then
-		echo "Updating kernel:"
-		echo "	kernel=$VMLINUZ"
-		echo "	initrd=$INITRD"
+		echo "Updating kernel $VMLINUZ to $ISO_REMASTER_DIR/casper/vmlinuz"
 		cp -f "$VMLINUZ" "$ISO_REMASTER_DIR/casper/vmlinuz"
-		cp -f "$INITRD" "$ISO_REMASTER_DIR/casper/initrd.gz"
-	else
-		echo "Not updating kernel as initrd not present"
 	fi
+
+	if [ -e "$ISO_REMASTER_DIR/casper/vmlinuz.efi" -a -e "$VMLINUZ_EFI" ]
+	then
+		echo "Updating kernel $VMLINUZ_EFI to $ISO_REMASTER_DIR/casper/vmlinuz.efi"
+		cp -f "$VMLINUZ_EFI" "$ISO_REMASTER_DIR/casper/vmlinuz.efi"
+	fi
+
+	echo "Updating initrd $INITRD to $ISO_REMASTER_DIR/casper/initrd.gz"
+	cp -f "$INITRD" "$ISO_REMASTER_DIR/casper/initrd.gz"
+
+else
+	echo "Not updating kernel as initrd not present"
 fi
 
 # Misc fixup for Karmic
diff -Nru uck-2.4.7/libraries/remaster-live-cd.sh uck-2.4.7+SNAPSHOT150118192508/libraries/remaster-live-cd.sh
--- uck-2.4.7/libraries/remaster-live-cd.sh	2012-10-20 20:20:20.000000000 +0000
+++ uck-2.4.7+SNAPSHOT150118192508/libraries/remaster-live-cd.sh	2015-01-18 18:06:41.000000000 +0000
@@ -387,6 +387,9 @@
 	echo "Deactivating initctl..."
 	chroot "$REMASTER_DIR" mv /sbin/initctl /sbin/initctl.uck_blocked
 	chroot "$REMASTER_DIR" ln -s /bin/true /sbin/initctl
+
+	echo "Hacking invoke-rc.d to ignore missing init scripts..."
+	chroot "$REMASTER_DIR" sed -i -e "s/exit 100/exit 0 #exit 100/" /usr/sbin/invoke-rc.d
 	
 	echo "Deactivating update-grub..."
 	chroot "$REMASTER_DIR" mv /usr/sbin/update-grub /usr/sbin/update-grub.uck_blocked
@@ -397,8 +400,13 @@
 	chroot "$REMASTER_DIR" ln -s /bin/true /usr/sbin/grub-probe
 
 	echo "Hacking grub-probe postinst/postrm..."
-	chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postinst.d/zz-update-grub
-	chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/#exec update-grub/" /etc/kernel/postrm.d/zz-update-grub
+	chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/true #exec update-grub/" /etc/kernel/postinst.d/zz-update-grub
+	chroot "$REMASTER_DIR" sed -i -e "s/exec update-grub/true #exec update-grub/" /etc/kernel/postrm.d/zz-update-grub
+
+	if [ ! -e "$REMASTER_DIR/scripts" ]; then
+		echo "Linking missing /scripts dir..."
+		chroot "$REMASTER_DIR" ln -s /usr/share/initramfs-tools/scripts /scripts
+	fi
 
 	echo "Remembering kernel update state..."
 	update_flags="reboot-required reboot-required.pkgs do-not-hibernate"
@@ -423,6 +431,9 @@
 	echo "Reactivating initctl..."
 	chroot "$REMASTER_DIR" rm /sbin/initctl
 	chroot "$REMASTER_DIR" mv /sbin/initctl.uck_blocked /sbin/initctl
+
+	echo "Restoring invoke-rc.d..."
+	chroot "$REMASTER_DIR" sed -i -e "s/exit 0 #exit 100/exit 100/" /usr/sbin/invoke-rc.d
 	
 	echo "Reactivating update-grub..."
 	chroot "$REMASTER_DIR" rm /usr/sbin/update-grub
@@ -433,9 +444,14 @@
 	chroot "$REMASTER_DIR" mv /usr/sbin/grub-probe.uck_blocked /usr/sbin/grub-probe
 
 	echo "Reactivating grub-probe postinst/postrm..."
-	chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub
-	chroot "$REMASTER_DIR" sed -i -e "s/#exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub
+	chroot "$REMASTER_DIR" sed -i -e "s/true #exec update-grub/exec update-grub/" /etc/kernel/postinst.d/zz-update-grub
+	chroot "$REMASTER_DIR" sed -i -e "s/true #exec update-grub/exec update-grub/" /etc/kernel/postrm.d/zz-update-grub
 	
+	if [ -L "$REMASTER_DIR/scripts" ]; then
+		echo "Removing linked /scripts dir..."
+		chroot "$REMASTER_DIR" rm /scripts
+	fi
+
 	UCK_USER_HOME_DIR=`xauth info|grep 'Authority file'| sed "s/[ \t]//g" | sed "s/\/\.Xauthority//" | cut -d ':' -f2`
 	if [ `echo $UCK_USER_HOME_DIR | cut -d '/' -f2` == 'home' ] ; then
 		echo "Removing /home/username directory..."