diff --git a/src/etc/etc.armv7/Makefile.inc b/src/etc/etc.armv7/Makefile.inc
index 2c4008b8..a2bda39f 100644
--- a/src/etc/etc.armv7/Makefile.inc
+++ b/src/etc/etc.armv7/Makefile.inc
@@ -1,13 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2015/05/19 00:05:59 jsg Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2015/05/20 01:44:20 jsg Exp $
 
 ALLSOC=IMX OMAP SUNXI
-KERNELS=
-MDEXT=
+MDEXT=		bsd.rd
 
 .for SOC in ${ALLSOC}
-KERNELS+=	GENERIC-${SOC} bsd.${SOC}
 MDEXT+=		bsd.${SOC}.umg
-MDEXT+=		bsd.rd.${SOC}
 MDEXT+=		bsd.rd.${SOC}.umg
 .endfor
 
@@ -15,28 +12,16 @@ KERNADDR_OMAP=0x80300000
 KERNADDR_IMX=0x10300000
 KERNADDR_SUNXI=0x40300000
 
-.for CONF K in ${KERNELS}
-.  if !target($K)
-$K:
-	cd ../sys/arch/${MACHINE}/conf && config ${CONF}
-	cd ../sys/arch/${MACHINE}/compile/${CONF} && \
-	    ${MAKE} clean && exec ${MAKE}
-.  endif
-ALL_KERNELS += $K
-.endfor
+bootblocks:
 
 kernels: bootblocks ${ALL_KERNELS}
 .for CONF K in ${KERNELS}
 	cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
-.endfor
 .for SOC in ${ALLSOC}
 	mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
-	    ${RELEASEDIR}/bsd.${SOC} ${RELEASEDIR}/bsd.${SOC}.umg
+	    ${RELEASEDIR}/$K ${RELEASEDIR}/$K.${SOC}.umg
+.endfor
 .endfor
-
-ALL_KERNELS=
-
-bootblocks:
 
 MDEXT+=	miniroot-am335x-${OSrev}.fs miniroot-beagle-${OSrev}.fs \
 	miniroot-imx-${OSrev}.fs miniroot-panda-${OSrev}.fs \