Index: branches/blackosx/package/Scripts/EFI/postinstall
===================================================================
--- branches/blackosx/package/Scripts/EFI/postinstall	(revision 1556)
+++ branches/blackosx/package/Scripts/EFI/postinstall	(revision 1557)
@@ -151,10 +151,10 @@
 				fi
 
 				# Write the stage 1 loader to the partition boot sector
-				"$scriptDir"WriteChameleonStage1.sh "${espformat}" "${stage1LoaderHFS}" "${stage1LoaderFAT}" "${targetVolumeChosenByUser}" "${targetDeviceRaw}" "${targetVolume}" "${scriptDir}"
+				"$scriptDir"WriteChameleonStage1.sh "${espformat}" "${stage1LoaderHFS}" "${stage1LoaderFAT}" "${targetVolumeChosenByUser}" "${targetDeviceRaw}" "${targetVolumeChosenByUser}" "${scriptDir}"
 
 				# Write the stage 2 loader to the root of the selected partition
-				"$scriptDir"WriteChameleonStage2.sh "${espformat}" "${stage2Loader}" "${targetVolumeChosenByUser}" "${targetDevice}" "${targetVolume}" "${scriptDir}"
+				"$scriptDir"WriteChameleonStage2.sh "${espformat}" "${stage2Loader}" "${targetVolume}" "${targetDevice}" "${targetVolumeChosenByUser}" "${scriptDir}"
 
 				# Set the active partition ONLY if Windows is not installed
 				"$scriptDir"SetActivePartition.sh "${espformat}" "${diskSigCheck}" "${targetDiskRaw}" "${targetSlice}" "${targetVolumeChosenByUser}" "${scriptDir}"
Index: branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh
===================================================================
--- branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh	(revision 1556)
+++ branches/blackosx/package/Scripts/Install/WriteChameleonStage2.sh	(revision 1557)
@@ -36,11 +36,11 @@
 # if chosen, the package installer will add a file named 'nullESP'
 # in to the temporary directory /.Chameleon
 
-if [ "${targetVolume}" = "/Volumes/EFI" ]; then
+if [ "${selectedDestination}" = "/Volumes/EFI" ]; then
 	echo "DEBUG: EFI install chosen"
 
-	if [ ! -d "${targetVolume}" ]; then
-		echo "Executing Command: mkdir -p ${targetVolume}"
+	if [ ! -d "${selectedDestination}" ]; then
+		echo "Executing Command: mkdir -p ${selectedDestination}"
 		mkdir -p "${targetVolume}"
 	else
 		echo "DEBUG: folder /Volumes/EFI already exists"
@@ -55,20 +55,22 @@
 		mount_hfs "${targetDevice}" "${targetVolume}"
 	fi
 	if [ ${espformat} = 2 ]; then
-		[ -d "${targetVolume}" ] || mkdir -p "${targetVolume}"
-		echo "Executing command: mount_msdos -u 0 -g 0 ${targetDevice} ${targetVolume}"
-		mount_msdos -u 0 -g 0 "${targetDevice}" "${targetVolume}"
+		[ -d "${selectedDestination}" ] || mkdir -p "${selectedDestination}"
+		echo "Executing command: mount_msdos -u 0 -g 0 ${targetDevice} ${selectedDestination}"
+		mount_msdos -u 0 -g 0 "${targetDevice}" "${selectedDestination}"
 	fi
 
-	echo "Executing command: cp "${selectedDestination}"/usr/standalone/i386/${stage2Loader} ${targetVolume}"
-	cp "${selectedDestination}"/usr/standalone/i386/"${stage2Loader}" "${targetVolume}"
+	echo "Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${selectedDestination}"
+	cp "${targetVolume}"/usr/standalone/i386/"${stage2Loader}" "${selectedDestination}"
+	"$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${selectedDestination}."
 else
 	echo "Executing command: cp "${targetVolume}"/usr/standalone/i386/${stage2Loader} ${targetVolume}"
 	cp "${targetVolume}"/usr/standalone/i386/"${stage2Loader}" "${targetVolume}"
+	"$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume}."
 fi
 
-"$scriptDir"InstallLog.sh "${targetVolume}" "Written boot to ${targetVolume}."
 
+
 #ĘCheck to see if the user wants to hide the boot file
 
 #if [ -f "${selectedDestination}"/.Chameleon/nullhideboot ]; then