diff --git a/tools/Makefile b/tools/Makefile
index c697f9c49..72a1c14d6 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -131,14 +131,12 @@ SUBDIR += .WAIT texinfo \
 .endif
 SUBDIR+= stat .WAIT
 
-.if defined(__MINIX)
 SUBDIR += \
 	mkfs.mfs \
 	partition \
 	toproto
-.else
+
 SUBDIR+= .WAIT config
-.endif # defined(__MINIX)
 
 .if ${MKLLVM} != "no"
 SUBDIR+= \
diff --git a/tools/config/Makefile b/tools/config/Makefile
new file mode 100644
index 000000000..09589fb1b
--- /dev/null
+++ b/tools/config/Makefile
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.6 2005/06/05 18:19:53 thorpej Exp $
+
+HOSTPROGNAME=	${_TOOL_PREFIX}config
+HOST_SRCDIR=	usr.bin/config
+
+HOST_CPPFLAGS+=	-DMAKE_BOOTSTRAP
+
+.include "${.CURDIR}/../Makefile.host"