Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1311,6 +1311,10 @@
 ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
 .endif
 
+.if !exists(/usr/bin/iconv)
+_iconv=		usr.bin/iconv
+.endif
+
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -1379,6 +1383,7 @@
     ${_dtc} \
     ${_awk} \
     ${_cat} \
+    ${_iconv} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     usr.bin/rpcgen \
@@ -1425,11 +1430,11 @@
     bin/sh \
     ${_rescue} \
     ${LOCAL_TOOL_DIRS} \
+    lib/libmagic \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
     usr.bin/awk \
-    lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
     usr.bin/vi/catalog
Index: share/mk/bsd.nls.mk
===================================================================
--- share/mk/bsd.nls.mk
+++ share/mk/bsd.nls.mk
@@ -44,7 +44,11 @@
 NLSSRCDIR_${file}?= ${NLSSRCDIR}
 ${file}.msg: ${NLSSRCFILES_${file}:S/^/${NLSSRCDIR_${file}}\//}
 	@rm -f ${.TARGET}
+.if defined(NLSICONV_${file})
+	iconv -f ${NLSICONV_${file}:E} -t ${file:E} ${.ALLSRC} > ${.TARGET}
+.else
 	cat ${.ALLSRC} > ${.TARGET}
+.endif
 CLEANFILES+= ${file}.msg
 .endif
 .endfor
Index: usr.bin/ee/Makefile
===================================================================
--- usr.bin/ee/Makefile
+++ usr.bin/ee/Makefile
@@ -13,7 +13,8 @@
 WARNS?=	2
 
 NLS=	C fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
-	uk_UA.KOI8-U pt_BR.ISO8859-1 ru_RU.KOI8-R hu_HU.ISO8859-2
+	uk_UA.KOI8-U pt_BR.ISO8859-1 ru_RU.KOI8-R hu_HU.ISO8859-2 \
+	ru_RU.UTF-8
 
 NLSLINKS_C= en_US.ISO8859-1 en_US.ISO8859-15
 NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
@@ -23,9 +24,13 @@
         de_CH.ISO8859-15 de_DE.ISO8859-15
 NLSLINKS_pt_BR.ISO8859-1= pt_PT.ISO8859-1
 
+NLSICONV_ru_RU.UTF-8=	ru_RU.KOI8-R
+
 NLSSRCFILES=ee.msg
 .for lang in ${NLS}
-. if exists(${.CURDIR}/nls/${lang}/ee.msg)
+. if defined(NLSICONV_${lang})
+NLSSRCDIR_${lang}= ${.CURDIR}/nls/${NLSICONV_${lang}}
+. elif exists(${.CURDIR}/nls/${lang}/ee.msg)
 NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang}
 . else
 NLSSRCDIR_${lang}= ${.CURDIR}/../../contrib/ee