diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 0ff160db7ec7..4143f1cd22cc 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#     $Id: BSD.local.dist,v 1.43 1998/12/14 07:44:46 dillon Exp $
+#     $Id: BSD.local.dist,v 1.44 1998/12/18 08:06:34 asami Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -221,6 +221,8 @@
             ..
             ja_JP.SJIS
             ..
+            ja_JP.Shift_JIS
+            ..
 	    ko_KR.EUC
             ..
 	    lt_LN.ASCII
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 8a7e2814c702..4de18ea72283 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.155 1999/05/03 17:42:34 gpalmer Exp $
+#	$Id: BSD.usr.dist,v 1.156 1999/05/05 19:44:14 markm Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -507,6 +507,8 @@
             ..
             ja_JP.SJIS
             ..
+            ja_JP.Shift_JIS
+            ..
 	    ko_KR.EUC
             ..
 	    lt_LN.ASCII
@@ -745,6 +747,8 @@
             ..
             ja_JP.SJIS
             ..
+            ja_JP.Shift_JIS
+            ..
 	    ko_KR.EUC
             ..
 	    lt_LN.ASCII
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 1f71dc58f21d..00825f4fc20b 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 1999/03/20 11:49:23 foxfair Exp $
+# $Id: Makefile,v 1.21 1999/04/10 12:22:25 foxfair Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -19,7 +19,7 @@ LOCALES=	de_DE.DIS_8859-15 \
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
 ASCIILINKS = \
-	ko_KR.EUC ja_JP.EUC ja_JP.SJIS zh_CN.EUC
+	ko_KR.EUC ja_JP.EUC ja_JP.SJIS ja_JP.Shift_JIS zh_CN.EUC
 
 ZHLINKS =    zh_TW.BIG5
 
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index 5e9075d3204b..a3e817d88c43 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 1998/08/15 12:51:48 phk Exp $
+# $Id: Makefile,v 1.17 1998/12/14 02:59:15 dillon Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -51,6 +51,8 @@ afterinstall:
 	ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \
 		${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE
 .endfor
+	ln -fs ../ja_JP.SJIS/LC_CTYPE \
+		${LOCALEDIR}/ja_JP.Shift_JIS/LC_CTYPE
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/timedef/data/Makefile b/share/timedef/data/Makefile
index 152eaebcc1ef..0cfdc1014a27 100644
--- a/share/timedef/data/Makefile
+++ b/share/timedef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.29 1999/01/21 19:41:37 imp Exp $
+# $Id: Makefile,v 1.30 1999/03/20 11:48:55 foxfair Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -41,6 +41,7 @@ LN_LINKS =      lt_LN.ASCII lt_LN.ISO_8859-2
 NL_LINKS =      nl_BE
 US_LINKS =      en_CA
 GB_LINKS =      en_AU
+JP_LINKS = 	ja_JP.Shift_JIS
 
 .SUFFIXES: .src .out
 
@@ -110,5 +111,9 @@ afterinstall:
 		ln -fs ../en_GB.ISO_8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.DIS_8859-15/LC_TIME; \
 	done
+	for l in ${JP_LINKS}; do \
+		ln -fs ../ja_JP.SJIS/LC_TIME \
+		       ${LOCALEDIR}/$$l/LC_TIME; \
+	done
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 1f71dc58f21d..00825f4fc20b 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 1999/03/20 11:49:23 foxfair Exp $
+# $Id: Makefile,v 1.21 1999/04/10 12:22:25 foxfair Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -19,7 +19,7 @@ LOCALES=	de_DE.DIS_8859-15 \
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
 ASCIILINKS = \
-	ko_KR.EUC ja_JP.EUC ja_JP.SJIS zh_CN.EUC
+	ko_KR.EUC ja_JP.EUC ja_JP.SJIS ja_JP.Shift_JIS zh_CN.EUC
 
 ZHLINKS =    zh_TW.BIG5
 
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 5e9075d3204b..a3e817d88c43 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 1998/08/15 12:51:48 phk Exp $
+# $Id: Makefile,v 1.17 1998/12/14 02:59:15 dillon Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -51,6 +51,8 @@ afterinstall:
 	ln -fs ../lt_LN.ISO_8859-2/LC_CTYPE \
 		${LOCALEDIR}/${link}.ISO_8859-2/LC_CTYPE
 .endfor
+	ln -fs ../ja_JP.SJIS/LC_CTYPE \
+		${LOCALEDIR}/ja_JP.Shift_JIS/LC_CTYPE
 .endif
 
 .include <bsd.prog.mk>