diff --git a/etc/Makefile b/etc/Makefile
index f4d322eff4a0..a3cb5d3ce5f0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.119 1995/08/06 12:22:27 bde Exp $
+#	$Id: Makefile,v 1.120 1995/10/10 09:47:51 phk Exp $
 
 # disktab may be wrong -- hcx9 is a tahoe, but gets its own.
 # -rw-r--r--
@@ -131,6 +131,7 @@ CRYPT_SRCS+=	secure
 .endif
 CRYPT_DIRS=	bin sbin usr usr/bin usr/lib
 
+# Compatibility stuff, remove those links
 LATIN1LINKS = \
 	da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES fi_FI \
 	fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE nl_NL no_NO \
@@ -442,6 +443,14 @@ des-tarball:
 distrib-dirs:
 	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
 	mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+# Compatibility stuff, remove obsoleted links, if exists
+	if [ -d	${DESTDIR}/usr/share/locale ] ;	\
+	then \
+		cd ${DESTDIR}/usr/share/locale;	\
+		for l in ${LATIN1LINKS}	; do \
+			[ -d $$l.ISO_8859-1 ] || rm -f $$l.ISO_8859-1; \
+		done; \
+	fi
 	mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
@@ -450,10 +459,35 @@ distrib-dirs:
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/locale; \
-	for l in ${LATIN1LINKS} ; do \
-		rm -f $$l.ISO_8859-1; \
-		ln -s lt_LN.ISO_8859-1 $$l.ISO_8859-1; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
 	done
+	cd ${DESTDIR}/usr/share/nls; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
+	done; \
+	rm -rf POSIX; \
+	ln -s C POSIX
+.if defined(MAKE_LOCAL)
+	cd ${DESTDIR}/usr/local/share/nls; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
+	done; \
+	rm -rf POSIX; \
+	ln -s C POSIX
+.endif
 
 floppies:	kcopy.flp filesyst.flp cpio.flp cdins.flp
 
diff --git a/etc/locale.alias b/etc/locale.alias
new file mode 100644
index 000000000000..967909c46306
--- /dev/null
+++ b/etc/locale.alias
@@ -0,0 +1,123 @@
+american.iso88591	en_US.ISO_8859-1
+c-french.iso88591	fr_CA.ISO_8859-1
+Cextend		en_US.ISO_8859-1
+Cextend.en	en_US.ISO_8859-1
+da		da_DK.ISO_8859-1
+danish.iso88591	da_DK.ISO_8859-1
+da_DK		da_DK.ISO_8859-1
+da_DK.88591	da_DK.ISO_8859-1
+da_DK.88591.en	da_DK.ISO_8859-1
+da_DK.ISO8859-1	da_DK.ISO_8859-1
+de		de_DE.ISO_8859-1
+de_AT		de_AT.ISO_8859-1
+de_AT.ISO8859-1	de_AT.ISO_8859-1
+de_CH		de_CH.ISO_8859-1
+de_CH.ISO8859-1	de_CH.ISO_8859-1
+de_DE		de_DE.ISO_8859-1
+de_DE.88591	de_DE.ISO_8859-1
+de_DE.88591.en	de_DE.ISO_8859-1
+de_DE.ISO8859-1	de_DE.ISO_8859-1
+dutch.iso88591	nl_BE.ISO_8859-1
+en		en_US.ISO_8859-1
+english.iso88591	en_US.ISO_8859-1
+ENG_GB.8859	en_GB.ISO_8859-1
+ENG_GB.8859.in	en_GB.ISO_8859-1
+en_AU		en_AU.ISO_8859-1
+en_AU.ISO8859-1	en_AU.ISO_8859-1
+en_CA		en_CA.ISO_8859-1
+en_CA.ISO8859-1	en_CA.ISO_8859-1
+en_GB		en_GB.ISO_8859-1
+en_GB.88591	en_GB.ISO_8859-1
+en_GB.88591.en	en_GB.ISO_8859-1
+en_GB.ISO8859-1	en_GB.ISO_8859-1
+en_US		en_US.ISO_8859-1
+en_US.88591	en_US.ISO_8859-1
+en_US.88591.en	en_US.ISO_8859-1
+en_US.ISO8859-1	en_US.ISO_8859-1
+es		es_ES.ISO_8859-1
+es_ES		es_ES.ISO_8859-1
+es_ES.88591	es_ES.ISO_8859-1
+es_ES.88591.en	es_ES.ISO_8859-1
+es_ES.ISO8859-1	es_ES.ISO_8859-1
+fi		fi_FI.ISO_8859-1
+finnish.iso88591	fi_FI.ISO_8859-1
+fi_FI		fi_FI.ISO_8859-1
+fi_FI.88591	fi_FI.ISO_8859-1
+fi_FI.88591.en	fi_FI.ISO_8859-1
+fi_FI.ISO8859-1	fi_FI.ISO_8859-1
+fr		fr_FR.ISO_8859-1
+french.iso88591	fr_CH.ISO_8859-1
+FRE_FR.8859	fr_FR.ISO_8859-1
+FRE_FR.8859.in	fr_FR.ISO_8859-1
+fr_BE		fr_BE.ISO_8859-1
+fr_BE.88591	fr_BE.ISO_8859-1
+fr_BE.88591.en	fr_BE.ISO_8859-1
+fr_BE.ISO8859-1	fr_BE.ISO_8859-1
+fr_CA		fr_CA.ISO_8859-1
+fr_CA.88591	fr_CA.ISO_8859-1
+fr_CA.88591.en	fr_CA.ISO_8859-1
+fr_CA.ISO8859-1	fr_CA.ISO_8859-1
+fr_CH		fr_CH.ISO_8859-1
+fr_CH.88591	fr_CH.ISO_8859-1
+fr_CH.88591.en	fr_CH.ISO_8859-1
+fr_CH.ISO8859-1	fr_CH.ISO_8859-1
+fr_FR		fr_FR.ISO_8859-1
+fr_FR.88591	fr_FR.ISO_8859-1
+fr_FR.88591.en	fr_FR.ISO_8859-1
+fr_FR.ISO8859-1	fr_FR.ISO_8859-1
+german.iso88591	de_CH.ISO_8859-1
+GER_DE.8859	de_DE.ISO_8859-1
+GER_DE.8859.in	de_DE.ISO_8859-1
+icelandic.iso88591	is_IS.ISO_8859-1
+is		is_IS.ISO_8859-1
+ISO8859-1	en_US.ISO_8859-1
+iso_8859_1	en_US.ISO_8859-1
+is_IS		is_IS.ISO_8859-1
+is_IS.ISO8859-1	is_IS.ISO_8859-1
+it		it_IT.ISO_8859-1
+italian.iso88591	it_IT.ISO_8859-1
+it_CH		it_CH.ISO_8859-1
+it_CH.ISO8859-1	it_CH.ISO_8859-1
+it_IT		it_IT.ISO_8859-1
+it_IT.88591	it_IT.ISO_8859-1
+it_IT.88591.en	it_IT.ISO_8859-1
+it_IT.ISO8859-1	it_IT.ISO_8859-1
+ja		ja_JP.EUC
+japan		ja_JP.EUC
+japanese	ja_JP.EUC
+Japanese-EUC	ja_JP.EUC
+ja_JP		ja_JP.EUC
+ja_JP.AJEC	ja_JP.EUC
+ja_JP.eucJP	ja_JP.EUC
+ja_JP.ujis	ja_JP.EUC
+Jp_JP		ja_JP.EUC
+nl		nl_NL.ISO_8859-1
+nl_BE		nl_BE.ISO_8859-1
+nl_BE.88591	nl_BE.ISO_8859-1
+nl_BE.88591.en	nl_BE.ISO_8859-1
+nl_BE.ISO8859-1	nl_BE.ISO_8859-1
+nl_NL		nl_NL.ISO_8859-1
+nl_NL.88591	nl_NL.ISO_8859-1
+nl_NL.88591.en	nl_NL.ISO_8859-1
+nl_NL.ISO8859-1	nl_NL.ISO_8859-1
+no		no_NO.ISO_8859-1
+norwegian.iso88591	no_NO.ISO_8859-1
+no_NO		no_NO.ISO_8859-1
+no_NO.88591	no_NO.ISO_8859-1
+no_NO.88591.en	no_NO.ISO_8859-1
+no_NO.ISO8859-1	no_NO.ISO_8859-1
+portuguese.iso88591	pt_PT.ISO_8859-1
+pt		pt_PT.ISO_8859-1
+pt_PT		pt_PT.ISO_8859-1
+pt_PT.88591	pt_PT.ISO_8859-1
+pt_PT.88591.en	pt_PT.ISO_8859-1
+pt_PT.ISO8859-1	pt_PT.ISO_8859-1
+ru_RU		ru_SU.KOI8-R
+ru_RU.KOI8-R	ru_SU.KOI8-R
+spanish.iso88591	es_ES.ISO_8859-1
+sv		sv_SE.ISO_8859-1
+sv_SE		sv_SE.ISO_8859-1
+sv_SE.88591	sv_SE.ISO_8859-1
+sv_SE.88591.en	sv_SE.ISO_8859-1
+sv_SE.ISO8859-1	sv_SE.ISO_8859-1
+swedish.iso88591	sv_SE.ISO_8859-1