diff --git a/ext/mysql2/mysql_enc_to_ruby.h b/ext/mysql2/mysql_enc_to_ruby.h
index 37dbf6f73..6be3cb089 100644
--- a/ext/mysql2/mysql_enc_to_ruby.h
+++ b/ext/mysql2/mysql_enc_to_ruby.h
@@ -3,17 +3,17 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "ISO-8859-2",
   NULL,
   "CP850",
-  "ISO-8859-1",
+  "UTF-8",
   NULL,
   "KOI8-R",
-  "ISO-8859-1",
+  "UTF-8",
   "ISO-8859-2",
   NULL,
   "US-ASCII",
   "eucJP-ms",
   "Shift_JIS",
   "Windows-1251",
-  "ISO-8859-1",
+  "UTF-8",
   "ISO-8859-8",
   NULL,
   "TIS-620",
@@ -29,7 +29,7 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "GBK",
   "Windows-1257",
   "ISO-8859-9",
-  "ISO-8859-1",
+  "UTF-8",
   NULL,
   "UTF-8",
   "Windows-1250",
@@ -45,22 +45,22 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "Windows-1250",
   "UTF-8",
   "UTF-8",
-  "ISO-8859-1",
-  "ISO-8859-1",
-  "ISO-8859-1",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   "Windows-1251",
   "Windows-1251",
   "Windows-1251",
   "macRoman",
   "UTF-16",
   "UTF-16",
-  NULL,
+  "",
   "Windows-1256",
   "Windows-1257",
   "Windows-1257",
   "UTF-32",
   "UTF-32",
-  NULL,
+  "",
   "ASCII-8BIT",
   NULL,
   "US-ASCII",
@@ -92,7 +92,7 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "eucJP-ms",
   NULL,
   NULL,
-  "ISO-8859-1",
+  "UTF-8",
   "Windows-31J",
   "Windows-31J",
   "eucJP-ms",
@@ -119,10 +119,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16",
   "UTF-16",
   "UTF-16",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
+  "UTF-16",
   NULL,
   NULL,
   NULL,
@@ -146,6 +146,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-16BE",
   "UTF-16BE",
   "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
+  "UTF-16BE",
   NULL,
   NULL,
   NULL,
@@ -153,11 +157,11 @@ const char *mysql2_mysql_enc_to_rb[] = {
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-16BE",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
+  "UTF-32",
   "UTF-32",
   "UTF-32",
   "UTF-32",
@@ -178,10 +182,6 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-32",
   "UTF-32",
   "UTF-32",
-  NULL,
-  NULL,
-  NULL,
-  NULL,
   NULL,
   NULL,
   NULL,
@@ -210,6 +210,10 @@ const char *mysql2_mysql_enc_to_rb[] = {
   "UTF-8",
   "UTF-8",
   "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   NULL,
   NULL,
   NULL,
@@ -217,11 +221,11 @@ const char *mysql2_mysql_enc_to_rb[] = {
   NULL,
   NULL,
   NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
+  "UTF-8",
   "UTF-8",
   "UTF-8",
   "UTF-8",