--- yelp-2.23.1.orig/src/yelp-man.c	2008-06-02 21:56:46 +0400
+++ yelp-2.23.1/src/yelp-man.c	2008-09-01 05:25:45 +0400
@@ -112,7 +112,7 @@
     { "sk",    "ISO-8859-2" },
     { "sv",    "ISO-8859-1" },
     { "tr",    "ISO-8859-9" },
-    { "uk",    "ISO-8859-5" },
+    { "uk",    "KOI8-U" },
     { "zh_CN", "BIG5" },
     { "zh_TW", "BIG5" },
     { NULL,    NULL },
@@ -407,7 +407,7 @@
 man_process (YelpMan *man)
 {
     YelpManPriv *priv;
-    const gchar   *language;
+    gchar   *language;
     const gchar   *encoding;
     YelpManParser *parser;
     YelpError *error = NULL;
@@ -433,8 +433,7 @@
 	goto done;
     }
 
-    /* FIXME: get the language */
-    language = "C";
+    language = g_strndup (g_getenv("LANG"), 2);
 
     /* default encoding if the language doesn't match below */
     encoding = g_getenv("MAN_ENCODING");
@@ -446,6 +445,7 @@
 	    if (g_str_equal (language, langmap[i].language)) {
 		encoding = langmap[i].encoding;
 		break;
+		g_free (language);
 	    }
 	}
     }