Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2353,10 +2353,9 @@
 ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal
 .endif
 
-.if ${MK_LOCALES} != "no"
+# C.UTF-8 is always built in share/ctypes and we need localdef for that.
 _localedef=	usr.bin/localedef
 ${_bt}-usr.bin/localedef: ${_bt}-usr.bin/yacc ${_bt_lex_depend}
-.endif
 
 .if ${MK_ICONV} != "no"
 _mkesdb=	usr.bin/mkesdb
Index: share/ctypedef/Makefile
===================================================================
--- share/ctypedef/Makefile
+++ share/ctypedef/Makefile
@@ -218,7 +218,7 @@
 
 # C.UTF-8 is the default locale, so it should always been installed.
 ALWAYS=		C.UTF-8.LC_CTYPE
-FILES=		${LOCALES:NC.UTF-8:S/$/.LC_CTYPE/}
+FILES=		${LOCALES:NC.UTF-8:C/.+$/&.LC_CTYPE/}
 CLEANFILES=	${FILES}
 
 .for f t in ${SAME}