diff --git a/html/charset/table.go b/html/charset/table.go
index aa0d9484..a7f26e67 100644
--- a/html/charset/table.go
+++ b/html/charset/table.go
@@ -123,6 +123,7 @@ var encodings = map[string]struct {
 	"koi8":                {charmap.KOI8R, "koi8-r"},
 	"koi8-r":              {charmap.KOI8R, "koi8-r"},
 	"koi8_r":              {charmap.KOI8R, "koi8-r"},
+	"koi8-ru":             {charmap.KOI8U, "koi8-u"},
 	"koi8-u":              {charmap.KOI8U, "koi8-u"},
 	"csmacintosh":         {charmap.Macintosh, "macintosh"},
 	"mac":                 {charmap.Macintosh, "macintosh"},
@@ -196,7 +197,6 @@ var encodings = map[string]struct {
 	"iso-ir-58":           {simplifiedchinese.GBK, "gbk"},
 	"x-gbk":               {simplifiedchinese.GBK, "gbk"},
 	"gb18030":             {simplifiedchinese.GB18030, "gb18030"},
-	"hz-gb-2312":          {simplifiedchinese.HZGB2312, "hz-gb-2312"},
 	"big5":                {traditionalchinese.Big5, "big5"},
 	"big5-hkscs":          {traditionalchinese.Big5, "big5"},
 	"cn-big5":             {traditionalchinese.Big5, "big5"},
@@ -208,6 +208,7 @@ var encodings = map[string]struct {
 	"csiso2022jp":         {japanese.ISO2022JP, "iso-2022-jp"},
 	"iso-2022-jp":         {japanese.ISO2022JP, "iso-2022-jp"},
 	"csshiftjis":          {japanese.ShiftJIS, "shift_jis"},
+	"ms932":               {japanese.ShiftJIS, "shift_jis"},
 	"ms_kanji":            {japanese.ShiftJIS, "shift_jis"},
 	"shift-jis":           {japanese.ShiftJIS, "shift_jis"},
 	"shift_jis":           {japanese.ShiftJIS, "shift_jis"},
@@ -225,9 +226,10 @@ var encodings = map[string]struct {
 	"ksc_5601":            {korean.EUCKR, "euc-kr"},
 	"windows-949":         {korean.EUCKR, "euc-kr"},
 	"csiso2022kr":         {encoding.Replacement, "replacement"},
-	"iso-2022-kr":         {encoding.Replacement, "replacement"},
+	"hz-gb-2312":          {encoding.Replacement, "replacement"},
 	"iso-2022-cn":         {encoding.Replacement, "replacement"},
 	"iso-2022-cn-ext":     {encoding.Replacement, "replacement"},
+	"iso-2022-kr":         {encoding.Replacement, "replacement"},
 	"utf-16be":            {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
 	"utf-16":              {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
 	"utf-16le":            {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},