diff --git a/src/mbyte.c b/src/mbyte.c
index 735bf65..f508f8a 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -364,7 +364,6 @@
     {"949",		IDX_CP949},
     {"936",		IDX_CP936},
     {"gbk",		IDX_CP936},
-    {"gb18030",		IDX_CP936},	/* only 99% the same */
     {"950",		IDX_CP950},
     {"eucjp",		IDX_EUC_JP},
     {"unix-jis",	IDX_EUC_JP},
diff --git a/src/option.c b/src/option.c
index 0bd218c..3be5612 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3290,6 +3290,14 @@
 	 * If not, go back to the default "latin1". */
 	save_enc = p_enc;
 	p_enc = p;
+	if (STRCMP(p_enc, "gb18030") == 0)
+	{
+	    /* We don't support "gb18030", but "cp936" is a good substitute
+	     * for practical purposes, thus use that.  It's not an alias to
+	     * still support conversion between gb18030 and utf-8. */
+	    p_enc = vim_strsave((char_u *)"cp936");
+	    vim_free(p);
+	}
 	if (mb_init() == NULL)
 	{
 	    opt_idx = findoption((char_u *)"encoding");
diff --git a/src/version.c b/src/version.c
index c9508b9..caffda0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    206,
+/**/
     205,
 /**/
     204,