diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 41ce66d5716c..b1257579ddcc 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1468 2010/06/18 16:29:01 hannken Exp $
+#	$NetBSD: mi,v 1.1469 2010/06/18 18:57:27 jmcneill Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -47,6 +47,7 @@
 ./usr/bin/lorder				comp-util-bin
 ./usr/bin/menuc					comp-c-bin
 ./usr/bin/mkstr					comp-c-bin
+./usr/bin/mkubootimage				comp-util-bin
 ./usr/bin/msgattrib				comp-c-bin
 ./usr/bin/msgc					comp-c-bin
 ./usr/bin/msgcat				comp-c-bin
diff --git a/tools/Makefile b/tools/Makefile
index 90dfcbd08b44..a9ca2dfe352b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.138 2010/06/04 08:34:35 jmmv Exp $
+#	$NetBSD: Makefile,v 1.139 2010/06/18 18:57:27 jmcneill Exp $
 
 .include <bsd.own.mk>
 
@@ -115,6 +115,10 @@ SUBDIR+=	amiga-txlt
 SUBDIR+=	hp300-mkboot
 .endif
 
+.if ${MACHINE} == "evbarm"
+SUBDIR+=	mkubootimage
+.endif
+
 check_MKTOOLS: .PHONY .NOTMAIN
 .if ${MKTOOLS:Uyes} == "no"
 	@echo '*** WARNING: "MKTOOLS" is set to "no"; this will prevent building and'
diff --git a/tools/mkubootimage/Makefile b/tools/mkubootimage/Makefile
new file mode 100644
index 000000000000..62e360c8c24c
--- /dev/null
+++ b/tools/mkubootimage/Makefile
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.1 2010/06/18 18:57:28 jmcneill Exp $
+
+HOSTPROGNAME=	${_TOOL_PREFIX}mkubootimage
+HOST_SRCDIR=	usr.bin/mkubootimage
+
+HOST_CPPFLAGS+= -I${.CURDIR}
+
+.include "${.CURDIR}/../Makefile.host"
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 8f48803c3342..b670087f537d 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.187 2010/06/17 06:29:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.188 2010/06/18 18:57:27 jmcneill Exp $
 #	from: @(#)Makefile	8.3 (Berkeley) 1/7/94
 
 .include <bsd.own.mk>
@@ -16,7 +16,8 @@ SUBDIR= apply apropos asa at audio awk \
 	kdump ktrace ktruss lam last lastcomm ldd leave less \
 	locale locate lock logger login logname look lorder m4 \
 	machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
-	mkdep mkesdb mkfifo mklocale mkstr mktemp moduli msgc msgs \
+	mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage moduli \
+	msgc msgs \
 	nbperf netgroup netstat newgrp newsyslog nfsstat nice nl nohup nvi \
 	pagesize passwd paste patch pathchk pkill pmap pmc pr \
 	printenv printf progress pwhash qsubst quota radioctl rdist \