diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index dc3fd34a62..a6143ef8a7 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1483,6 +1483,13 @@ $ <userinput>psql -l</userinput>
          <literal>UTF8</literal>
          </entry>
         </row>
+        <row>
+         <entry><literal>EUC_JIS_2004</literal></entry>
+         <entry><emphasis>EUC_JIS_2004</emphasis>,
+         <literal>SHIFT_JIS_2004</literal>,
+         <literal>UTF8</literal>
+         </entry>
+        </row>
         <row>
          <entry><literal>EUC_KR</literal></entry>
          <entry><emphasis>EUC_KR</emphasis>,
@@ -1538,8 +1545,7 @@ $ <userinput>psql -l</userinput>
         </row>
         <row>
          <entry><literal>JOHAB</literal></entry>
-         <entry><emphasis>JOHAB</emphasis>,
-         <literal>UTF8</literal>
+         <entry><emphasis>not supported as a server encoding</emphasis>
          </entry>
         </row>
         <row>
@@ -1645,6 +1651,11 @@ $ <userinput>psql -l</userinput>
          <entry><emphasis>not supported as a server encoding</emphasis>
          </entry>
         </row>
+        <row>
+         <entry><literal>SHIFT_JIS_2004</literal></entry>
+         <entry><emphasis>not supported as a server encoding</emphasis>
+         </entry>
+        </row>
         <row>
          <entry><literal>SQL_ASCII</literal></entry>
          <entry><emphasis>any (no conversion will be performed)</emphasis>