diff --git a/etc/Makefile b/etc/Makefile
index 1f3444b9da70..02b7439df8ce 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -166,6 +166,19 @@ 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
diff --git a/etc/locale.deprecated b/etc/locale.deprecated
new file mode 100644
index 000000000000..4a695d1f56f7
--- /dev/null
+++ b/etc/locale.deprecated
@@ -0,0 +1,11 @@
+# $FreeBSD$
+#
+# List of deprecated locales
+#
+# Make sure that deprecated locale directories and their replacements
+# are set up correctly.
+#
+ru_SU.KOI8-R		ru_RU.KOI8-R
+ru_SU.ISO_8859-1	ru_RU.ISO8859-1
+ru_SU.CP866		ru_RU.CP866
+ru_RU.ISO_8859-1	ru_RU.ISO8859-1