diff --git a/etc/Makefile b/etc/Makefile
index 7d36cfbeab30..0d324b3fd8a4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -153,19 +153,6 @@ distribution:
 .endif
 
 distrib-dirs:
-	-set - `grep "^[a-zA-Z]" ${.CURDIR}/locale.deprecated`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		for dir in /usr/share/locale \
-			   /usr/share/nls \
-			   /usr/local/share/nls; \
-		do \
-			test -d ${DESTDIR}/$${dir} && cd ${DESTDIR}/$${dir}; \
-			test -L "$$2" && rm -rf "$$2"; \
-			test \! -L "$$1" && test -d "$$1" && mv "$$1" "$$2"; \
-		done; \
-		shift; shift; \
-	done
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
 	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
@@ -192,14 +179,6 @@ distrib-dirs:
 		ln -s "$$2" "$$1"; \
 		shift; shift; \
 	done
-	cd ${DESTDIR}/usr/share/locale; \
-	set - `grep "^[a-zA-Z]" ${.CURDIR}/locale.alias`; \
-	while [ $$# -gt 0 ] ; \
-	do \
-		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
-		shift; shift; \
-	done
 	cd ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1; ln -sf ../man* .
 	cd ${DESTDIR}/usr/share/nls; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
diff --git a/etc/locale.alias b/etc/locale.alias
deleted file mode 100644
index f715745fa18d..000000000000
--- a/etc/locale.alias
+++ /dev/null
@@ -1,80 +0,0 @@
-# $FreeBSD$
-
-ASCII                   en_US.US-ASCII
-US-ASCII                en_US.US-ASCII
-af_ZA.ISO_8859-1        af_ZA.ISO8859-1
-af_ZA.ISO_8859-15       af_ZA.ISO8859-15
-ca_ES.ISO_8859-1        ca_ES.ISO8859-1
-ca_ES.ISO_8859-15       ca_ES.ISO8859-15
-cs_CZ.ISO_8859-2        cs_CZ.ISO8859-2
-da_DK.ISO_8859-1        da_DK.ISO8859-1
-da_DK.ISO_8859-15       da_DK.ISO8859-15
-de_AT.ISO_8859-1        de_AT.ISO8859-1
-de_AT.ISO_8859-15       de_AT.ISO8859-15
-de_CH.ISO_8859-1        de_CH.ISO8859-1
-de_CH.ISO_8859-15       de_CH.ISO8859-15
-de_DE.ISO_8859-1        de_DE.ISO8859-1
-de_DE.ISO_8859-15       de_DE.ISO8859-15
-el_GR.ISO_8859-7        el_GR.ISO8859-7
-en_AU.ISO_8859-1        en_AU.ISO8859-1
-en_AU.ISO_8859-15       en_AU.ISO8859-15
-en_CA.ISO_8859-1        en_CA.ISO8859-1
-en_CA.ISO_8859-15       en_CA.ISO8859-15
-en_GB.ISO_8859-1        en_GB.ISO8859-1
-en_GB.ISO_8859-15       en_GB.ISO8859-15
-en_NZ.ISO_8859-1        en_NZ.ISO8859-1
-en_NZ.ISO_8859-15       en_NZ.ISO8859-15
-en_US.ISO_8859-1        en_US.ISO8859-1
-en_US.ISO_8859-15       en_US.ISO8859-15
-es_ES.ISO_8859-1        es_ES.ISO8859-1
-es_ES.ISO_8859-15       es_ES.ISO8859-15
-et_EE.ISO_8859-15       et_EE.ISO8859-15
-fi_FI.ISO_8859-1        fi_FI.ISO8859-1
-fi_FI.ISO_8859-15       fi_FI.ISO8859-15
-fr_BE.ISO_8859-1        fr_BE.ISO8859-1
-fr_BE.ISO_8859-15       fr_BE.ISO8859-15
-fr_CA.ISO_8859-1        fr_CA.ISO8859-1
-fr_CA.ISO_8859-15       fr_CA.ISO8859-15
-fr_CH.ISO_8859-1        fr_CH.ISO8859-1
-fr_CH.ISO_8859-15       fr_CH.ISO8859-15
-fr_FR.ISO_8859-1        fr_FR.ISO8859-1
-fr_FR.ISO_8859-15       fr_FR.ISO8859-15
-hr_HR.ISO_8859-2        hr_HR.ISO8859-2
-hu_HU.ISO_8859-2        hu_HU.ISO8859-2
-is_IS.ISO_8859-1        is_IS.ISO8859-1
-is_IS.ISO_8859-15       is_IS.ISO8859-15
-it_CH.ISO_8859-1        it_CH.ISO8859-1
-it_CH.ISO_8859-15       it_CH.ISO8859-15
-it_IT.ISO_8859-1        it_IT.ISO8859-1
-it_IT.ISO_8859-15       it_IT.ISO8859-15
-ja_JP.EUC               ja_JP.eucJP
-ja_JP.Shift_JIS         ja_JP.SJIS
-ko_KR.EUC               ko_KR.eucKR
-la_LN.ASCII             la_LN.US-ASCII
-la_LN.ISO_8859-1        la_LN.ISO8859-1
-la_LN.ISO_8859-15       la_LN.ISO8859-15
-la_LN.ISO_8859-2        la_LN.ISO8859-2
-la_LN.ISO_8859-4        la_LN.ISO8859-4
-lt_LT.ISO_8859-4        lt_LT.ISO8859-4
-lt_LT.ISO_8859-13       lt_LT.ISO8859-13
-nl_BE.ISO_8859-1        nl_BE.ISO8859-1
-nl_BE.ISO_8859-15       nl_BE.ISO8859-15
-nl_NL.ISO_8859-1        nl_NL.ISO8859-1
-nl_NL.ISO_8859-15       nl_NL.ISO8859-15
-no_NO.ISO_8859-1        no_NO.ISO8859-1
-no_NO.ISO_8859-15       no_NO.ISO8859-15
-pl_PL.ISO_8859-2        pl_PL.ISO8859-2
-pt_PT.ISO_8859-1        pt_PT.ISO8859-1
-pt_PT.ISO_8859-15       pt_PT.ISO8859-15
-ru_SU.CP866             ru_RU.CP866
-ru_RU.ISO_8859-5        ru_RU.ISO8859-5
-ru_SU.ISO8859-5         ru_RU.ISO8859-5
-ru_SU.ISO_8859-5        ru_RU.ISO8859-5
-ru_SU.KOI8-R            ru_RU.KOI8-R
-sk_SK.ISO_8859-2        sk_SK.ISO8859-2
-sl_SI.ISO_8859-2        sl_SI.ISO8859-2
-sr_YU.ISO_8859-5        sr_YU.ISO8859-5
-sv_SE.ISO_8859-1        sv_SE.ISO8859-1
-sv_SE.ISO_8859-15       sv_SE.ISO8859-15
-tr_TR.ISO_8859-9        tr_TR.ISO8859-9
-zh_CN.EUC               zh_CN.eucCN
diff --git a/etc/locale.deprecated b/etc/locale.deprecated
deleted file mode 100644
index cc314ef9c75a..000000000000
--- a/etc/locale.deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-#
-# List of deprecated locales
-#
-# Make sure that deprecated locale directories and their replacements
-# are set up correctly.
-#
-# Format:
-# <deprecated_locale>	<new_locale>
-#
-ja_JP.EUC		ja_JP.eucJP
-ko_KR.EUC		ko_KR.eucKR
-ru_RU.ISO_8859-5	ru_RU.ISO8859-5
-ru_SU.CP866		ru_RU.CP866
-ru_SU.ISO_8859-5	ru_RU.ISO8859-5
-ru_SU.KOI8-R		ru_RU.KOI8-R
-zh_CN.EUC		zh_CN.eucCN
diff --git a/etc/nls.alias b/etc/nls.alias
index 22331c1f786c..805c34ab6b8a 100644
--- a/etc/nls.alias
+++ b/etc/nls.alias
@@ -1,78 +1,4 @@
 # $FreeBSD$
 
-ASCII                   C
 POSIX                   C
-US-ASCII                C
-af_ZA.ISO_8859-1        af_ZA.ISO8859-1
-af_ZA.ISO_8859-15       af_ZA.ISO8859-15
-cs_CZ.ISO_8859-2        cs_CZ.ISO8859-2
-da_DK.ISO_8859-1        da_DK.ISO8859-1
-da_DK.ISO_8859-15       da_DK.ISO8859-15
-de_AT.ISO_8859-1        de_AT.ISO8859-1
-de_AT.ISO_8859-15       de_AT.ISO8859-15
-de_CH.ISO_8859-1        de_CH.ISO8859-1
-de_CH.ISO_8859-15       de_CH.ISO8859-15
-de_DE.ISO_8859-1        de_DE.ISO8859-1
-de_DE.ISO_8859-15       de_DE.ISO8859-15
-el_GR.ISO_8859-7        el_GR.ISO8859-7
-en_AU.ISO_8859-1        en_AU.ISO8859-1
-en_AU.ISO_8859-15       en_AU.ISO8859-15
-en_CA.ISO_8859-1        en_CA.ISO8859-1
-en_CA.ISO_8859-15       en_CA.ISO8859-15
-en_GB.ISO_8859-1        en_GB.ISO8859-1
-en_GB.ISO_8859-15       en_GB.ISO8859-15
-en_NZ.ISO_8859-1        en_NZ.ISO8859-1
-en_NZ.ISO_8859-15       en_NZ.ISO8859-15
-en_US.ISO_8859-1        en_US.ISO8859-1
-en_US.ISO_8859-15       en_US.ISO8859-15
 en_US.US-ASCII          C
-es_ES.ISO_8859-1        es_ES.ISO8859-1
-es_ES.ISO_8859-15       es_ES.ISO8859-15
-et_EE.ISO_8859-15       et_EE.ISO8859-15
-fi_FI.ISO_8859-1        fi_FI.ISO8859-1
-fi_FI.ISO_8859-15       fi_FI.ISO8859-15
-fr_BE.ISO_8859-1        fr_BE.ISO8859-1
-fr_BE.ISO_8859-15       fr_BE.ISO8859-15
-fr_CA.ISO_8859-1        fr_CA.ISO8859-1
-fr_CA.ISO_8859-15       fr_CA.ISO8859-15
-fr_CH.ISO_8859-1        fr_CH.ISO8859-1
-fr_CH.ISO_8859-15       fr_CH.ISO8859-15
-fr_FR.ISO_8859-1        fr_FR.ISO8859-1
-fr_FR.ISO_8859-15       fr_FR.ISO8859-15
-hr_HR.ISO_8859-2        hr_HR.ISO8859-2
-hu_HU.ISO_8859-2        hu_HU.ISO8859-2
-is_IS.ISO_8859-1        is_IS.ISO8859-1
-is_IS.ISO_8859-15       is_IS.ISO8859-15
-it_CH.ISO_8859-1        it_CH.ISO8859-1
-it_CH.ISO_8859-15       it_CH.ISO8859-15
-it_IT.ISO_8859-1        it_IT.ISO8859-1
-it_IT.ISO_8859-15       it_IT.ISO8859-15
-ja_JP.EUC               ja_JP.eucJP
-ja_JP.Shift_JIS         ja_JP.SJIS
-ko_KR.EUC               ko_KR.eucKR
-la_LN.ASCII             la_LN.US-ASCII
-la_LN.ISO_8859-1        la_LN.ISO8859-1
-la_LN.ISO_8859-15       la_LN.ISO8859-15
-la_LN.ISO_8859-2        la_LN.ISO8859-2
-la_LN.ISO_8859-4        la_LN.ISO8859-4
-lt_LT.ISO_8859-4        lt_LT.ISO8859-4
-nl_BE.ISO_8859-1        nl_BE.ISO8859-1
-nl_BE.ISO_8859-15       nl_BE.ISO8859-15
-nl_NL.ISO_8859-1        nl_NL.ISO8859-1
-nl_NL.ISO_8859-15       nl_NL.ISO8859-15
-no_NO.ISO_8859-1        no_NO.ISO8859-1
-no_NO.ISO_8859-15       no_NO.ISO8859-15
-pl_PL.ISO_8859-2        pl_PL.ISO8859-2
-pt_PT.ISO_8859-1        pt_PT.ISO8859-1
-pt_PT.ISO_8859-15       pt_PT.ISO8859-15
-ru_RU.ISO_8859-5        ru_RU.ISO8859-5
-ru_SU.CP866             ru_RU.CP866
-ru_SU.ISO_8859-5        ru_RU.ISO8859-5
-ru_SU.ISO8859-5         ru_RU.ISO8859-5
-ru_SU.KOI8-R            ru_RU.KOI8-R
-sk_SK.ISO_8859-2        sk_SK.ISO8859-2
-sl_SI.ISO_8859-2        sl_SI.ISO8859-2
-sv_SE.ISO_8859-1        sv_SE.ISO8859-1
-sv_SE.ISO_8859-15       sv_SE.ISO8859-15
-tr_TR.ISO_8859-9        tr_TR.ISO8859-9
-zh_CN.EUC               zh_CN.eucCN