diff --git a/share/locale/Makefile b/share/locale/Makefile
index 992abd0f95e1..63ff27f67a9d 100644
--- a/share/locale/Makefile
+++ b/share/locale/Makefile
@@ -1,15 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2001/08/14 11:40:40 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2001/10/20 06:04:59 jmc Exp $
 
 .include <bsd.own.mk>
 
-# XXX - Temporarily disable building locale files on USE_NEW_TOOLCHAIN. - XXX
-#
-# The /usr/bin/mklocale program is very tied to NetBSD-current and is useless
-# for cross builds (as is one of the main purposes of the new toolchain).
-# Disable building the ctype files until mklocale is in a cross-usable state.
-
-.ifndef USE_NEW_TOOLCHAIN
 SUBDIR=	ctype
-.endif
 
 .include <bsd.subdir.mk>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 9cff1cb4279d..f22313b935a0 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.187 2001/10/13 06:11:23 jmc Exp $
+#	$NetBSD: bsd.own.mk,v 1.188 2001/10/20 06:05:00 jmc Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -58,7 +58,7 @@ LORDER=		NM="${NM}" ${TOOLDIR}/bin/lorder
 MAKEINFO=	${TOOLDIR}/bin/makeinfo
 MENUC=		MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/menuc
 MKDEP=		CC=${CC} ${TOOLDIR}/bin/mkdep
-#MKLOCALE=	${TOOLDIR}/bin/mklocale
+MKLOCALE=	${TOOLDIR}/bin/mklocale
 MSGC=		MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/msgc
 MTREE=		${TOOLDIR}/bin/mtree
 NM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-nm
diff --git a/tools/Makefile b/tools/Makefile
index b9ac03e4347f..63ec46b2376a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2001/10/13 06:11:06 jmc Exp $
+#	$NetBSD: Makefile,v 1.8 2001/10/20 06:05:00 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
 SUBDIR=		binstall .WAIT gencat mkdep mtree rpcgen tsort \
 		yacc .WAIT lex .WAIT \
 		compile_et config lint lint1 lint2 lorder \
-		toolchain .WAIT texinfo crunchgen msgc menuc
+		toolchain .WAIT texinfo crunchgen msgc menuc mklocale
 
 TARGETS+=	build
 
diff --git a/tools/mklocale/Makefile b/tools/mklocale/Makefile
new file mode 100644
index 000000000000..e8cbb79b11d4
--- /dev/null
+++ b/tools/mklocale/Makefile
@@ -0,0 +1,7 @@
+#	$NetBSD: Makefile,v 1.1 2001/10/20 06:05:01 jmc Exp $
+
+HOST_SRCDIR=	usr.bin/mklocale
+
+.include "${.CURDIR}/../Makefile.host"
+
+${TIMESTAMP}: ${SRCS}