diff --git a/docs/lcdproc-user/drivers/imon.docbook b/docs/lcdproc-user/drivers/imon.docbook
index da26ef2..7e03867 100644
--- a/docs/lcdproc-user/drivers/imon.docbook
+++ b/docs/lcdproc-user/drivers/imon.docbook
@@ -77,6 +77,53 @@ For further details, please consult the page and the forum at
     when the kernel module (<link linkend="imon-kernelmodules">see above</link>) is loaded.
   </para></listitem>
 </varlistentry>
+
+<varlistentry>
+  <term>
+    <property>CharMap</property> =
+    {
+      <emphasis><parameter><literal>hd44780_euro</literal></parameter></emphasis> |
+      <parameter><literal>hd44780_koi8_r</literal></parameter> |
+      <parameter><literal>upd16314</literal></parameter> |
+      <parameter><literal>none</literal></parameter>
+    }
+  </term>
+  <listitem><para>
+      Set the character mapping depending on the display you have:
+      <itemizedlist>
+        <listitem><para>
+          The default, <literal>hd44780_euro</literal> is for displays with
+          a ROM mask supporting the european charset (ROM code A02).
+        </para></listitem>
+        <listitem><para>
+          <literal>hd44780_koi8_r</literal> maps input from a client in
+          Russian KOI8-R to displays with a ROM mask supporting the european
+          charset (ROM code A02).
+        </para></listitem>
+        <listitem><para>
+          <literal>upd16314</literal> is for displays with a Nec uPD16314
+          vacuum fluorescent display (VFD) controller with ROM code 002
+          character set. If your display has ROM code 001 character set you
+          may use the <literal>hd44780_euro</literal> charmap instead.
+        </para></listitem>
+        <listitem><para>
+          The <literal>none</literal> charmap does not translate any characters.
+          It displays the characters the display controllers actually has
+          stored in its CGROM for that position instead. This setting is
+          intended for debugging purpose.
+        </para></listitem>
+      </itemizedlist>
+      You only need to set this parameter if you have a non-standard charmap.
+
+      <tip>
+        <para>
+        See <filename>server/drivers/hd44780-charset.h</filename>
+        in <package>LCDproc</package>'s source directory for the actual
+        mappings.
+        </para>
+      </tip>
+  </para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect3>
diff --git a/server/drivers/hd44780-charmap.h b/server/drivers/hd44780-charmap.h
index 6c4bcf5..d794f76 100644
--- a/server/drivers/hd44780-charmap.h
+++ b/server/drivers/hd44780-charmap.h
@@ -168,7 +168,6 @@ const unsigned char HD44780_euro_charmap[] = {
         248, 249, 250, 251, 252, 253, 254, 255
 };
 
-
 /*
  * Electronic Assembly's KS0073 based LCDs table
  * http://www.lcd-module.de/eng/pdf/doma/dip204-4e.pdf
@@ -284,7 +283,7 @@ const unsigned char SED1278F_0B_charmap[] = {
  * Table for HD44780 controller with ROM mask supporting
  * the european charset (ROM code A02).
  *
- * Russian KOI8-R codepage as input, comments in KOI8-R.
+ * Russian KOI8-R codepage as input
  */
 const unsigned char HD44780_KOI8R_charmap[] = {
         /* #0 */
@@ -308,15 +307,15 @@ const unsigned char HD44780_KOI8R_charmap[] = {
         112, 113, 114, 115, 116, 117, 118, 119,
         120, 121, 122, 123, 124, 125, 126, 127,
         /* #128 */
-         45, 124,  43,  43,  43,  43,  43,  43,
-         43,  43,  43,  32,  32,  32,  32,  32,
-         32,  32,  32,  32, 183, 183,  32, 126,
-         28,  29,  32,  32, 176, 178, 183, 247,
+         45, 124,  43,  43,  43,  43,  43,  43,       /* ─ │ ┌ ┐ └ ┘ ├ ┤ */
+         43,  43,  43,  32,  32,  32,  32,  32,       /* ┬ ┴ ┼ ▀ ▄ █ ▌ ▐ */
+        144, 145, 146, 147, 148, 149, 150, 126,       /*               ≈ */
+         28,  29, 154, 155, 176, 157, 183, 247,       /* ≤ ≥     °   · ÷ */
         /* #160 */
-         45, 124,  43, 203,  43,  43,  43,  43,       /*       ё         */
-         43,  43,  43,  43,  43,  43,  43,  43,
-         43,  43,  43, 203,  43,  43,  43,  43,       /*       Ё         */
-         43,  43,  43,  43,  43,  43,  43, 169,
+        160, 161, 162, 203, 164, 165, 166, 167,       /*       ё         */
+        168, 169, 170, 171, 172, 173, 174, 175,
+        176, 177, 178, 203, 180, 181, 182, 183,       /*       Ё         */
+        184, 185, 186, 187, 188, 189, 190, 169,       /*               © */
         /* #192 */
         172,  65, 128, 137, 129,  69, 216, 146,       /* ю а б ц д е ф г */
          88, 132, 133,  75, 134,  77,  72,  79,       /* х и й к л м н о */