diff --git a/mc.changes b/mc.changes
index e5bf73c..f430866 100644
--- a/mc.changes
+++ b/mc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 25 08:25:11 UTC 2011 - lazy.kent@opensuse.org
+
+- Don't convert Russian and Ukrainian docs. They have been already
+  in UTF-8 (bnc#686483).
+- Install help and hints for non-english locales (bnc#681060).
+
 -------------------------------------------------------------------
 Wed Mar 23 08:19:15 UTC 2011 - pcerny@novell.com
 
diff --git a/mc.spec b/mc.spec
index 5dfd70f..6bed94c 100644
--- a/mc.spec
+++ b/mc.spec
@@ -124,8 +124,6 @@ iconv -f iso8859-2 -t utf-8 -o mc.hint.cs.tmp mc.hint.cs && mv mc.hint.cs.tmp mc
 iconv -f iso8859-2 -t utf-8 -o mc.hint.hu.tmp mc.hint.hu && mv mc.hint.hu.tmp mc.hint.hu
 iconv -f iso8859-2 -t utf-8 -o mc.hint.pl.tmp mc.hint.pl && mv mc.hint.pl.tmp mc.hint.pl
 iconv -f iso8859-5 -t utf-8 -o mc.hint.sr.tmp mc.hint.sr && mv mc.hint.sr.tmp mc.hint.sr
-iconv -f koi8-r -t utf8 -o mc.hint.ru.tmp mc.hint.ru && mv mc.hint.ru.tmp mc.hint.ru
-iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk
 iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp mc.hint.zh
 popd
 pushd misc
@@ -146,15 +144,12 @@ popd
 pushd pl
 iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
 popd
-pushd ru
-iconv -f koi8-r -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
-popd
 pushd sr
 iconv -f iso8859-5 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in
 iconv -f iso8859-5 -t utf-8 -o mcserv.8.in.tmp mcserv.8.in && mv mcserv.8.in.tmp mcserv.8.in
 popd # doc/man
 popd # doc/
-pushd hlp 
+pushd hlp
 pushd es
 iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
 popd
@@ -167,9 +162,6 @@ popd
 pushd pl
 iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
 popd
-pushd ru
-iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
-popd
 pushd sr
 iconv -f iso8859-5 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp
 popd # doc/hlp
@@ -242,6 +234,9 @@ rm -rf %{buildroot}
 %exclude %{_sysconfdir}/mc/mc.menu.*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+
+%files lang -f %{name}.lang
+%defattr(-, root, root)
 %lang(es) %doc %{_mandir}/es
 %lang(hu) %doc %{_mandir}/hu
 %lang(it) %doc %{_mandir}/it
@@ -254,8 +249,9 @@ rm -rf %{buildroot}
 %lang(it) %doc %{_datadir}/mc/*/mc.*.it
 %lang(nl) %doc %{_datadir}/mc/*/mc.*.nl
 %lang(pl) %doc %{_datadir}/mc/*/mc.*.pl
+%lang(ru) %doc %{_datadir}/mc/*/mc.*.ru
 %lang(sr) %doc %{_datadir}/mc/*/mc.*.sr
-
-%files lang -f %{name}.lang
+%lang(uk) %doc %{_datadir}/mc/*/mc.*.uk
+%lang(zh) %doc %{_datadir}/mc/*/mc.*.zh
 
 %changelog