diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index 08c1a49..22d27b0 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -614,6 +614,8 @@ _kernel_src_compile() {
 		all || die "genkernel failed"
 	ARCH=${OLDARCH}
 
+	cp "${S}"/Module.symvers "${S}"/System.map "${S}"/include/linux/version.h "${WORKDIR}"
+
 
 	# Buffalo Boxes have a special naming and start address
 	if [ "${K_NASKERNEL_TYPE}" = "buffalo" ]; then
@@ -632,10 +634,10 @@ _kernel_src_compile() {
 			cp "${S}"/${K_NASKERNEL_DTB} "${WORKDIR}"/boot/dtb/
 			einfo "Create uImage of the resulting Image"
 			mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e 0x00008000 -n uImage-${KV_FULL} \
-				-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}
+				-d zImage.new "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}.buffalo
 			einfo "Create uInitrd with correct start address"
 			mkimage -A arm -O linux -T ramdisk -C none -a 0x00000000 -e 0x00000000 -n initrd-${KV_FULL} \
-				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uInitrd-genkernel-${ARCH}-${KV_FULL}
+				-d "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uInitrd-genkernel-${ARCH}-${KV_FULL}.buffalo
 		fi
 	fi
 
@@ -707,8 +709,8 @@ _kernel_src_install() {
 	_kernel_copy_config ".config"
 	doins ".config" || die "cannot copy kernel config"
 	doins Makefile || die "cannot copy Makefile"
-	doins Module.symvers || die "cannot copy Module.symvers"
-	doins System.map || die "cannot copy System.map"
+	doins "${WORKDIR}"/Module.symvers || die "cannot copy Module.symvers"
+	doins "${WORKDIR}"/System.map || die "cannot copy System.map"
 
 	# NOTE: this is a workaround caused by linux-info.eclass not
 	# being ported to EAPI=2 yet
@@ -723,7 +725,7 @@ _kernel_src_install() {
 	# Include include/linux/version.h to make Portage happy
 	dodir "${KV_OUT_DIR}/include/linux"
 	insinto "${KV_OUT_DIR}/include/linux"
-	doins "${S}/include/linux/version.h" || die "cannot copy version.h"
+	doins "${WORKDIR}/version.h" || die "cannot copy version.h"
 
 	insinto "/boot"
 	doins "${WORKDIR}"/boot/* || die "cannot copy /boot over"