diff --git a/src/charset.c b/src/charset.c
index b5dcfac..fd4b500 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -284,7 +284,12 @@
 		}
 		++c;
 	    }
+
+	    c = *p;
 	    p = skip_to_option_part(p);
+	    if (c == ',' && *p == NUL)
+		/* Trailing comma is not allowed. */
+		return FAIL;
 	}
     }
     chartab_initialized = TRUE;
diff --git a/src/version.c b/src/version.c
index 69184b0..90ac724 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    802,
+/**/
     801,
 /**/
     800,