diff -Naurp genkernel.orig/trunk/alpha/config.sh genkernel/trunk/alpha/config.sh
--- genkernel.orig/trunk/alpha/config.sh	2007-09-18 22:41:57.000000000 -0400
+++ genkernel/trunk/alpha/config.sh	2007-09-22 15:36:05.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="boot"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="arch/alpha/boot/vmlinux.gz"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="boot"
+KERNEL_PATH_TO_BINARY="arch/alpha/boot/"
+KERNEL_ALT_BINARY_NAME="vmlinux.gz"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/gen_cmdline.sh genkernel/trunk/gen_cmdline.sh
--- genkernel.orig/trunk/gen_cmdline.sh	2007-09-25 00:33:41.000000000 -0400
+++ genkernel/trunk/gen_cmdline.sh	2007-09-22 15:38:07.000000000 -0400
@@ -42,6 +42,7 @@ longusage() {
   echo "	--no-initrdmodules	Don't copy any modules to the initrd"
   echo "	--callback=<...>	Run the specified arguments after the"
   echo "				kernel and modules have been compiled"
+  echo "	--ktarget=<...>		Specify a kernel make target (default=vmlinux)"
   echo "	--static		Build a static (monolithic kernel)."
   echo "	--initramfs		Builds initramfs before kernel and embeds it"
   echo "				into the kernel."
@@ -457,8 +458,8 @@ parse_cmdline() {
 			print_info 2 "CMD_LINUXRC: ${CMD_LINUXRC}"
 			;;
 		--genzimage)
-			KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
-			KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
+			KERNEL_DEFAULT_MAKE_DIRECTIVE='zImage.initrd'
+			KERNEL_PATH_TO_BINARY='arch/powerpc/boot/'
 			ENABLE_PEGASOS_HACKS="yes"
 			print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
 			;;
diff -Naurp genkernel.orig/trunk/gen_compile.sh genkernel/trunk/gen_compile.sh
--- genkernel.orig/trunk/gen_compile.sh	2007-09-25 00:33:41.000000000 -0400
+++ genkernel/trunk/gen_compile.sh	2007-09-25 00:17:32.000000000 -0400
@@ -290,13 +290,8 @@ compile_kernel() {
 	[ "${KERNEL_MAKE}" = '' ] &&
 		gen_die "KERNEL_MAKE undefined - I don't know how to compile a kernel for this arch!"
 	cd ${KERNEL_DIR}
-	print_info 1 "        >> Compiling ${KV} ${KERNEL_MAKE_DIRECTIVE/_install/ [ install ]/}..."
-	compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel
-	if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
-	then
-		print_info 1 "        >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
-		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
-	fi
+	print_info 1 "        >> Compiling ${KV} ${CMD_KTARGET/_install/ [ install ]/}..."
+	compile_generic "${CMD_KTARGET}" kernel
 	if ! isTrue "${CMD_NOINSTALL}"
 	then
 		copy_image_with_preserve "kernel" \
@@ -310,7 +305,7 @@ compile_kernel() {
 		if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ]
 		then
 			copy_image_with_preserve "kernelz" \
-				"${KERNEL_BINARY_2}" \
+				"${KERNEL_BINARY}" \
 				"kernelz-${KV}"
 		fi
 	else
@@ -320,7 +315,7 @@ compile_kernel() {
 			gen_die "Could not copy System.map to ${TMPDIR}!"
 		if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ]
 		then
-			cp "${KERNEL_BINARY_2}" "${TMPDIR}/kernelz-${KV}" ||
+			cp "${KERNEL_BINARY}" "${TMPDIR}/kernelz-${KV}" ||
 				gen_die "Could not copy the kernelz binary to ${TMPDIR}!"
 		fi
 	fi
diff -Naurp genkernel.orig/trunk/gen_determineargs.sh genkernel/trunk/gen_determineargs.sh
--- genkernel.orig/trunk/gen_determineargs.sh	2007-09-18 22:42:42.000000000 -0400
+++ genkernel/trunk/gen_determineargs.sh	2007-09-25 00:19:01.000000000 -0400
@@ -325,6 +325,23 @@ determine_real_args() {
 		BUILD_INITRAMFS=0
 	fi
 
+	if [ "${CMD_KTARGET}" != '' ]
+	then
+		KERNEL_TARGET="${CMD_KTARGET}"
+	else
+		KERNEL_TARGET="${KERNEL_DEFAULT_MAKE_DIRECTIVE}"
+	fi
+
+	if [ "${KERNEL_TARGET}" != '' ]
+	then
+		if [ "${KERNEL_ALT_BINARY_NAME}" = "" ]
+		then
+			KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_TARGET}"
+		else
+			KERNEL_BINARY="${KERNEL_PATH_TO_BINARY}/${KERNEL_ALT_BINARY_NAME}"
+		fi
+	fi
+
 	if [ "${CMD_SAVE_CONFIG}" != '' ]
 	then
 		SAVE_CONFIG="${CMD_SAVE_CONFIG}"
diff -Naurp genkernel.orig/trunk/gen_package.sh genkernel/trunk/gen_package.sh
--- genkernel.orig/trunk/gen_package.sh	2007-09-25 00:33:41.000000000 -0400
+++ genkernel/trunk/gen_package.sh	2007-09-25 00:22:21.000000000 -0400
@@ -19,7 +19,7 @@ gen_minkernpackage()
 		cp ".config" "${TEMP}/minkernpackage/config-${ARCH}-${KV}" || gen_die 'Could not the copy kernel config for the min kernel package!'
 		if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ]
 		then
-			cp "${KERNEL_BINARY_2}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
+			cp "${KERNEL_BINARY}" "${TEMP}/minkernpackage/kernelz-${KV}" || gen_die "Could not copy the kernelz for the min kernel package"
 		fi
 	fi
 	
@@ -72,7 +72,7 @@ gen_kerncache()
 	cp "${KERNEL_DIR}/System.map" "${TEMP}/kerncache/System.map-${ARCH}-${KV}"
 	if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ]
         then
-        	cp "${KERNEL_BINARY_2}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
+        	cp "${KERNEL_BINARY}" "${TEMP}/kerncache/kernelz-${ARCH}-${KV}" || gen_die "Could not copy the kernelz for the kernel package"
         fi
 	
 	echo "VERSION = ${VER}" > "${TEMP}/kerncache/kerncache.config"
diff -Naurp genkernel.orig/trunk/ia64/config.sh genkernel/trunk/ia64/config.sh
--- genkernel.orig/trunk/ia64/config.sh	2007-09-18 22:41:59.000000000 -0400
+++ genkernel/trunk/ia64/config.sh	2007-09-25 00:25:39.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE=""
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinux.gz"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux.gz"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/mips/config.sh genkernel/trunk/mips/config.sh
--- genkernel.orig/trunk/mips/config.sh	2007-09-18 22:42:02.000000000 -0400
+++ genkernel/trunk/mips/config.sh	2007-09-25 00:26:11.000000000 -0400
@@ -2,9 +2,9 @@
 
 # Kernel Build Info
 KERNEL_MAKE=make
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="./vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 # Utils Build Info
 UTILS_MAKE=make
diff -Naurp genkernel.orig/trunk/parisc/config.sh genkernel/trunk/parisc/config.sh
--- genkernel.orig/trunk/parisc/config.sh	2007-09-18 22:42:37.000000000 -0400
+++ genkernel/trunk/parisc/config.sh	2007-09-25 00:26:30.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/parisc64/config.sh genkernel/trunk/parisc64/config.sh
--- genkernel.orig/trunk/parisc64/config.sh	2007-09-18 22:41:58.000000000 -0400
+++ genkernel/trunk/parisc64/config.sh	2007-09-25 00:26:44.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/ppc/config.sh genkernel/trunk/ppc/config.sh
--- genkernel.orig/trunk/ppc/config.sh	2007-09-18 22:41:57.000000000 -0400
+++ genkernel/trunk/ppc/config.sh	2007-09-25 00:27:08.000000000 -0400
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_BINARY="vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/ppc64/config.sh genkernel/trunk/ppc64/config.sh
--- genkernel.orig/trunk/ppc64/config.sh	2007-09-18 22:42:39.000000000 -0400
+++ genkernel/trunk/ppc64/config.sh	2007-09-25 00:27:34.000000000 -0400
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_BINARY="vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/sparc/config.sh genkernel/trunk/sparc/config.sh
--- genkernel.orig/trunk/sparc/config.sh	2007-09-18 22:42:00.000000000 -0400
+++ genkernel/trunk/sparc/config.sh	2007-09-25 00:27:48.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j1"
 
diff -Naurp genkernel.orig/trunk/sparc64/config.sh genkernel/trunk/sparc64/config.sh
--- genkernel.orig/trunk/sparc64/config.sh	2007-09-18 22:41:56.000000000 -0400
+++ genkernel/trunk/sparc64/config.sh	2007-09-25 00:28:02.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2="image"
-KERNEL_BINARY="arch/sparc64/boot/image"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="image"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="arch/sparc64/boot/"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/um/config.sh genkernel/trunk/um/config.sh
--- genkernel.orig/trunk/um/config.sh	2007-09-18 22:41:56.000000000 -0400
+++ genkernel/trunk/um/config.sh	2007-09-25 00:28:46.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="linux"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="linux"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="linux"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/x86/config.sh genkernel/trunk/x86/config.sh
--- genkernel.orig/trunk/x86/config.sh	2007-09-18 22:42:38.000000000 -0400
+++ genkernel/trunk/x86/config.sh	2007-09-25 00:28:59.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="bzImage"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="arch/i386/boot/bzImage"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="bzImage"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="arch/i386/boot/"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/x86_64/config.sh genkernel/trunk/x86_64/config.sh
--- genkernel.orig/trunk/x86_64/config.sh	2007-09-18 22:42:40.000000000 -0400
+++ genkernel/trunk/x86_64/config.sh	2007-09-25 00:29:25.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE="bzImage"
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="arch/x86_64/boot/bzImage"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="bzImage"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="arch/x86_64/boot/"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/xen0/config.sh genkernel/trunk/xen0/config.sh
--- genkernel.orig/trunk/xen0/config.sh	2007-09-18 22:42:41.000000000 -0400
+++ genkernel/trunk/xen0/config.sh	2007-09-25 00:29:57.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE=""
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinuz"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinuz"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
 
diff -Naurp genkernel.orig/trunk/xenU/config.sh genkernel/trunk/xenU/config.sh
--- genkernel.orig/trunk/xenU/config.sh	2007-09-18 22:42:04.000000000 -0400
+++ genkernel/trunk/xenU/config.sh	2007-09-25 00:30:12.000000000 -0400
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-KERNEL_MAKE_DIRECTIVE=""
-KERNEL_MAKE_DIRECTIVE_2=""
-KERNEL_BINARY="vmlinuz"
+KERNEL_DEFAULT_MAKE_DIRECTIVE="vmlinuz"
+KERNEL_ALT_BINARY_NAME=""
+KERNEL_PATH_TO_BINARY="./"
 
 [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"