diff -Nur e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/05sysconfig e-smith-base-5.4.0-utf-8/root/etc/e-smith/db/configuration/migrate/05sysconfig
--- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/05sysconfig	2005-11-21 05:28:05.000000000 +0100
+++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/db/configuration/migrate/05sysconfig	2013-05-18 11:47:41.605327053 +0200
@@ -4,7 +4,6 @@
     close F;
 
     my $lang = ($line =~ /^LANG="(.*)"/) ? $1 : "en-us";
-    $lang =~ s/\.UTF-8$//;
 
     my $kbdtype = "pc";
     my $keytable = "us";
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG	2005-11-21 05:28:08.000000000 +0100
+++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/LANG	2013-05-18 14:59:40.319511514 +0200
@@ -2,8 +2,10 @@
     $OUT = "";
     my $lang = $settings{LANG};
     return unless defined $lang;
-    if ($lang =~ /"(.*)\.UTF-8"/)
-    {
-	$settings{LANG} = '"' . $1 . '"';
+    $lang =~ s/^['"]//;
+    $lang =~ s/['"]$//;
+    if ($lang !~ /\.UTF\-8$/)
+    {   
+        $settings{LANG} = '"' . $lang . '.UTF-8"';
     }
 }
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT	2005-11-21 05:28:08.000000000 +0100
+++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONT	2013-05-18 13:49:30.541877689 +0200
@@ -2,8 +2,8 @@
     $OUT = "";
     my $sysfont = $settings{SYSFONT};
     return unless defined $sysfont;
-    if ($sysfont eq '"latarcyrheb-sun16"')
+    if ($sysfont eq '"lat0-sun16"')
     {
-	$settings{SYSFONT} = '"lat0-sun16"';
+	$settings{SYSFONT} = '"latarcyrheb-sun16"';
     }
 }
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM	2005-11-21 05:28:08.000000000 +0100
+++ e-smith-base-5.4.0-utf-8/root/etc/e-smith/templates/etc/sysconfig/i18n/SYSFONTACM	2013-05-18 13:50:08.093416513 +0200
@@ -1,8 +1,8 @@
 {
     $OUT = '';
-    unless ($settings{SYSFONTACM})
+    if ($settings{SYSFONTACM})
     {
-	$settings{SYSFONTACM} = '"iso15"';
-	$order{scalar keys %settings} = "SYSFONTACM";
+       $order{scalar keys %settings} = "SYSFONTACM";
+       delete $order{scalar keys %settings};
     }
 }