diff --git a/debian/changelog b/debian/changelog
index 079f99933..25cc0f900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,7 @@ linux-2.6 (2.6.28-1~experimental.1) UNRELEASED; urgency=low
     fit in flash.
   * [arm/orion5x] Unset FIXED_PHY to work around a clash with fixed
     mdio bus and mv643xx_eth.
+  * Migrate arm, armel, mips and mipsel away from kernel-package.
 
   [ Ian Campbell ]
   * [x86]: Enable Xen guest support in amd64 flavour. (closes: #495590)
diff --git a/debian/config/arm/defines b/debian/config/arm/defines
index 2cef91a6f..2cf33781a 100644
--- a/debian/config/arm/defines
+++ b/debian/config/arm/defines
@@ -8,7 +8,6 @@ kernel-arch: arm
 
 [image]
 suggests: fdutils
-type: kernel-package
 
 [footbridge_image]
 suggests: nwutil
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 1aa33bfd5..2fecff69f 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -8,7 +8,6 @@ kernel-arch: arm
 
 [image]
 suggests: fdutils
-type: kernel-package
 
 [iop32x_base]
 class: IOP32x
diff --git a/debian/config/mips/defines b/debian/config/mips/defines
index 601c0afac..9ef8a94c2 100644
--- a/debian/config/mips/defines
+++ b/debian/config/mips/defines
@@ -10,7 +10,6 @@ kernel-arch: mips
 
 [image]
 initramfs: false
-type: kernel-package
 
 [r4k-ip22_base]
 class: SGI IP22
diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines
index cf15e2ef4..ac9da7974 100644
--- a/debian/config/mipsel/defines
+++ b/debian/config/mipsel/defines
@@ -9,7 +9,6 @@ kernel-arch: mips
 
 [image]
 initramfs: false
-type: kernel-package
 
 [r5k-cobalt_base]
 class: Cobalt
diff --git a/debian/rules.real b/debian/rules.real
index 8c6783481..d52578b4d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -404,6 +404,10 @@ endif
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_SELF) install-base
 
+install-image_arm_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_armel_$(FEATURESET)_$(FLAVOUR)_plain_image:
+	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+
 install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@@ -411,6 +415,12 @@ install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
 install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
+install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_image:
+	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
+install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
+	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+
 install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
@@ -426,8 +436,12 @@ ifneq ($(INITRAMFS),False)
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES
 endif
 
+install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
+install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
+install-image_mips_$(FEATURESET)_r4k-ip22_plain_templates: ARG_BOOTLOADER = arcboot
+install-image_mips_$(FEATURESET)_r5k-ip32_plain_templates: ARG_BOOTLOADER = arcboot
 install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: