diff --git a/bin/csh/nls/Makefile b/bin/csh/nls/Makefile
index 7dcd0ae3b983..dc874d5aa53b 100644
--- a/bin/csh/nls/Makefile
+++ b/bin/csh/nls/Makefile
@@ -2,8 +2,9 @@
 
 SUBDIR= finnish french german italian spanish
 
-#Disabled - additional tuning required
-#SUBDIR+= ja
+.if defined(WANT_KANJI)
+SUBDIR+= ja
+.endif
 
 # We are not ready for greek yet
 #SUBDIR+= greek
diff --git a/bin/csh/nls/Makefile.inc b/bin/csh/nls/Makefile.inc
index ff21f2fd24f6..b9396f896f02 100644
--- a/bin/csh/nls/Makefile.inc
+++ b/bin/csh/nls/Makefile.inc
@@ -9,3 +9,9 @@ BASESRC=        ${.CURDIR}/../../../../contrib/tcsh/nls
 	${GENCAT} ${.TARGET} ${.IMPSRC}
 
 CLEANFILES+= tcsh.cat tcsh.msg
+
+all: tcsh.cat
+
+tcsh.cat: tcsh.msg
+
+distribute:
diff --git a/bin/csh/nls/finnish/Makefile b/bin/csh/nls/finnish/Makefile
index 57f05d5480ea..5c7c3fdadc2b 100644
--- a/bin/csh/nls/finnish/Makefile
+++ b/bin/csh/nls/finnish/Makefile
@@ -6,19 +6,15 @@ LL=     fi_FI.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 .for i in ${LL}
-	ln -fs ../${DL}/tcsh.cat ${DESTDIR}/..${NLSDIR}/$i/tcsh.cat
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/french/Makefile b/bin/csh/nls/french/Makefile
index fe5197d25bb3..9a3305f7d409 100644
--- a/bin/csh/nls/french/Makefile
+++ b/bin/csh/nls/french/Makefile
@@ -8,19 +8,15 @@ LL=     fr_BE.ISO_8859-1 fr_CA.ISO_8859-1 fr_CH.ISO_8859-1 \
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 .for i in ${LL}
-	ln -fs ../${DL}/tcsh.cat ${DESTDIR}/..${NLSDIR}/$i/tcsh.cat
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/german/Makefile b/bin/csh/nls/german/Makefile
index b6d45146faa5..5e126daef97a 100644
--- a/bin/csh/nls/german/Makefile
+++ b/bin/csh/nls/german/Makefile
@@ -7,19 +7,15 @@ LL=     de_AT.ISO_8859-1 de_CH.ISO_8859-1 de_AT.DIS_8859-15 \
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 .for i in ${LL}
-	ln -fs ../${DL}/tcsh.cat ${DESTDIR}/..${NLSDIR}/$i/tcsh.cat
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/greek/Makefile b/bin/csh/nls/greek/Makefile
index c51dc53da688..9826f03c7327 100644
--- a/bin/csh/nls/greek/Makefile
+++ b/bin/csh/nls/greek/Makefile
@@ -5,16 +5,12 @@ DL=     el_GR.ISO_8859-7
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/italian/Makefile b/bin/csh/nls/italian/Makefile
index 520457e35d8e..bed7d8a1e7e5 100644
--- a/bin/csh/nls/italian/Makefile
+++ b/bin/csh/nls/italian/Makefile
@@ -6,19 +6,15 @@ LL=     it_CH.ISO_8859-1 it_IT.DIS_8859-15 it_CH.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 .for i in ${LL}
-	ln -fs ../${DL}/tcsh.cat ${DESTDIR}/..${NLSDIR}/$i/tcsh.cat
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/ja/Makefile b/bin/csh/nls/ja/Makefile
index 1f6b549410a9..ed723354b0c5 100644
--- a/bin/csh/nls/ja/Makefile
+++ b/bin/csh/nls/ja/Makefile
@@ -5,16 +5,12 @@ DL=     ja_JP.EUC
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 
 .include <bsd.prog.mk>
diff --git a/bin/csh/nls/spanish/Makefile b/bin/csh/nls/spanish/Makefile
index fbc4c3dc9960..f6125f41c902 100644
--- a/bin/csh/nls/spanish/Makefile
+++ b/bin/csh/nls/spanish/Makefile
@@ -6,19 +6,15 @@ LL=     es_ES.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
-all: tcsh.cat
-
-tcsh.cat: tcsh.msg
-
 tcsh.msg: set[0-9]*
 	cat ${BASESRC}/${NL}/set[0-9] \
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}/..${NLSDIR}/${DL}/tcsh.cat
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 .for i in ${LL}
-	ln -fs ../${DL}/tcsh.cat ${DESTDIR}/..${NLSDIR}/$i/tcsh.cat
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.prog.mk>