diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index 4a193ce..3dfc5dd 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -511,6 +511,8 @@ _kernel_src_compile() {
 	fi
 
 	K_NASKERNEL_DTB="none"
+
+	#################################### ARM V5 ######################################
 	# Buffalo anounced a new box named Pro Live (video transcode streaming)
 	# so the old ls_pro_live has to be split to ls_pro ls_live
 	# for now let it stay but a move schould be done to ls_pro
@@ -591,6 +593,31 @@ _kernel_src_compile() {
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LS-XHL"
 	fi
 
+	#################################### ARM V6 ######################################
+	# oxnas
+	if [ "${K_NASKERNEL_NAME}" = "medion_stg212" ]; then
+		K_NASKERNEL_TYPE="default"
+		K_NASKERNEL_DEVICE="Oxford NAS"
+		K_GENKERNEL_ARGS+=" --kernel-target=uImage --kernel-binary=arch/arm/boot/uImage"
+	fi
+	if [ "${K_NASKERNEL_NAME}" = "pogoplug_pro" ]; then
+		K_NASKERNEL_TYPE="default"
+		K_NASKERNEL_DEVICE="Oxford NAS"
+		K_GENKERNEL_ARGS+=" --kernel-target=uImage --kernel-binary=arch/arm/boot/uImage"
+	fi
+	if [ "${K_NASKERNEL_NAME}" = "pogoplug_pro_pci" ]; then
+		K_NASKERNEL_TYPE="default"
+		K_NASKERNEL_DEVICE="Oxford NAS"
+		K_GENKERNEL_ARGS+=" --kernel-target=uImage --kernel-binary=arch/arm/boot/uImage"
+	fi
+	if [ "${K_NASKERNEL_NAME}" = "iomega_hmnd_ce" ]; then
+		K_NASKERNEL_TYPE="default"
+		K_NASKERNEL_DEVICE="Oxford NAS"
+		K_GENKERNEL_ARGS+=" --kernel-target=uImage --kernel-binary=arch/arm/boot/uImage"
+	fi
+
+
+	#################################### ARM V7 ######################################
 	# Freescale
 	if [ "${K_NASKERNEL_NAME}" = "freescale_mx53_loco" ]; then
 		K_NASKERNEL_TYPE="default"
@@ -649,6 +676,15 @@ _kernel_src_compile() {
 		fi
 	fi
 
+	if [ "${K_NASKERNEL_TYPE}" = "default" ]; then
+		einfo "Rename Kernel Image for consistency"
+		mv "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/uImage-genkernel-${ARCH}-${KV_FULL}
+		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/uInitramfs-genkernel-${ARCH}-${KV_FULL}
+	fi
+
+
 	# cleanup
 	rm -rf foo zImage.new ${K_NASKERNEL_DTB}
 	rm "${WORKDIR}"/boot/kernel-genkernel-${ARCH}-${KV_FULL} "${WORKDIR}"/boot/initramfs-genkernel-${ARCH}-${KV_FULL}