diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 99f7f48afd1..e7c4a8c7942 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -9,7 +9,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
 .src.LC_CTYPE:
 	localedef -D -U -c -w ${MAPLOC}/widths.txt \
-	-f ${MAPLOC}/map.${.IMPSRC:T:R:C/^.*\.//} \
+	-f ${MAPLOC}/map.${.IMPSRC:T:R:E} \
 	-i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R}  || true
 
 LOCALES+=	be_BY.CP1131
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index 70ef375004e..0eea27fd336 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -808,7 +808,7 @@ sub make_makefile {
 	}
 	elsif ($TYPE eq "ctypedef") {
 		$SRCOUT = "localedef -D -U -c -w \${MAPLOC}/widths.txt \\\n" .
-			"\t-f \${MAPLOC}/map.\${.IMPSRC:T:R:C/^.*\\.//} " .
+			"\t-f \${MAPLOC}/map.\${.IMPSRC:T:R:E} " .
 			"\\\n\t-i \${.IMPSRC} \${.OBJDIR}/\${.IMPSRC:T:R} " .
 			" || true";
 		$SRCOUT2 = "LC_CTYPE";