diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 5312ad4981..312664ab7a 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -6,15 +6,6 @@
 #
 
 KERNELNAME=
-ifneq (,$(findstring x86,$(BOARD)))
-  KERNELNAME="bzImage"
-endif
-ifneq (,$(findstring rdc,$(BOARD)))
-  KERNELNAME="bzImage"
-endif
-ifneq (,$(findstring avr32,$(BOARD)))
-  KERNELNAME="uImage"
-endif
 
 KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
 	CROSS_COMPILE="$(KERNEL_CROSS)" \
diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 62d249610e..8c85be2fd5 100644
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@@ -20,4 +20,6 @@ define Target/Description
   Build firmware images for ATNGW100 board
 endef
 
+KERNELNAME:=uImage
+
 $(eval $(call BuildTarget))
diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile
index be5936cfcc..9099e783e5 100644
--- a/target/linux/rdc/Makefile
+++ b/target/linux/rdc/Makefile
@@ -16,6 +16,8 @@ LINUX_VERSION:=2.6.32.25
 
 include $(INCLUDE_DIR)/target.mk
 
+KERNELNAME:=bzImage
+
 DEFAULT_PACKAGES += wpad-mini kmod-libphy kmod-r6040 kmod-input-core \
 		    kmod-input-polldev kmod-input-gpio-buttons kmod-button-hotplug \
 		    kmod-rdc321x-wdt
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 3cbed95426..fb365dd8ea 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -16,6 +16,8 @@ LINUX_VERSION:=2.6.32.25
 
 include $(INCLUDE_DIR)/target.mk
 
+KERNELNAME:=bzImage
+
 $(eval $(call BuildTarget))
 
 $(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \