diff --git a/docs/UPDATING b/docs/UPDATING
index f2e734a05..fc5cbd4b1 100644
--- a/docs/UPDATING
+++ b/docs/UPDATING
@@ -1,3 +1,7 @@
+20110629:
+	Rebuild m4:
+	make -C usr.bin/m4 install
+
 20110629:
 	You must install clang. It is now used to build some of
 	the userland utilities.
diff --git a/lib/Makefile b/lib/Makefile
index 2f174de35..4b083d1fc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -20,6 +20,10 @@ SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libcurses libdriver libnetdriver \
 	libexec libdevman libusb ${LIBMINLIB_DIR} ${LIBASYN_DIR}          \
 	libddekit
 
+.if defined(NBSD_LIBC) && (${NBSD_LIBC} != "no")
+SUBDIR+= libelf
+.endif
+
 .if ${COMPILER_TYPE} == "ack"
 SUBDIR+= ack/libd ack/libe ack/libfp ack/liby
 .endif
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index 4360e88e1..04425708c 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -1,7 +1,9 @@
 # $Id$
 
-# Requires NBSD_LIBC
+# Requires clang and NBSD_LIBC
 NBSD_LIBC:= yes
+CC:= clang
+COMPILER_TYPE:= gnu
 
 LIB=	elf
 
@@ -55,13 +57,16 @@ SRCS=	elf.c							\
 	libelf_phdr.c						\
 	libelf_shdr.c						\
 	libelf_xlate.c						\
-	compat/mmap.c						\
 	${GENSRCS}
 INCS=	libelf.h gelf.h elfdefinitions.h
 
 GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
 CLEANFILES=	${GENSRCS}
-CFLAGS+=        -I. -I${.CURDIR} -DNO_MMAP_FILE
+CFLAGS+=        -I. -I${.CURDIR}
+
+.PATH:		${.CURDIR}/compat
+SRCS+=		mmap.c
+CFLAGS+=	-DNO_MMAP_FILE
 
 SHLIB_MAJOR=	1
 
@@ -166,8 +171,7 @@ INCSDIR= /usr/include
 
 .include <bsd.lib.mk>
 
-# FIXME: Change to using base m4 when base m4 is updated
 # Keep the .SUFFIXES line after the include of bsd.lib.mk
 .SUFFIXES:	.m4 .c
 .m4.c:
-	gm4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET}
+	m4 -D SRCDIR=${.CURDIR} ${.IMPSRC} > ${.TARGET}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 24abee396..98ec348f1 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -2,6 +2,6 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= m4
+SUBDIR= m4 mkimage
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index 7c679f4ad..ef03e0ef1 100644
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -3,5 +3,7 @@ NBSD_LIBC:= yes
 CC:= clang
 COMPILER_TYPE:= gnu
 
+CPPFLAGS+= -D_NETBSD_SOURCE
+
 BINDIR?=/usr/bin
 
diff --git a/commands/mkimage/Makefile b/usr.bin/mkimage/Makefile
similarity index 66%
rename from commands/mkimage/Makefile
rename to usr.bin/mkimage/Makefile
index 4ef271bc6..622d5c909 100644
--- a/commands/mkimage/Makefile
+++ b/usr.bin/mkimage/Makefile
@@ -1,12 +1,7 @@
-
-NBSD_LIBC:= yes
-
 PROG=	mkimage
 SRCS=	mkimage.c
 MAN=
 
-CPPFLAGS+= -D_NETBSD_SOURCE
-
 DPADD+=	${LIBELF}
 LDADD+=	-lelf
 
diff --git a/commands/mkimage/mkimage.c b/usr.bin/mkimage/mkimage.c
similarity index 100%
rename from commands/mkimage/mkimage.c
rename to usr.bin/mkimage/mkimage.c