diff --git a/ext/mbstring/ucgendat/ucgendat.c b/ext/mbstring/ucgendat/ucgendat.c
index 42441082ef3..c0d9b432ba7 100644
--- a/ext/mbstring/ucgendat/ucgendat.c
+++ b/ext/mbstring/ucgendat/ucgendat.c
@@ -336,7 +336,9 @@ ordered_range_insert(ac_uint4 c, char *name, int len)
         (len == 3 &&
          (memcmp(name, "NSM", 3) == 0 || memcmp(name, "PDF", 3) == 0 ||
           memcmp(name, "LRE", 3) == 0 || memcmp(name, "LRO", 3) == 0 ||
-          memcmp(name, "RLE", 3) == 0 || memcmp(name, "RLO", 3) == 0))) {
+          memcmp(name, "RLE", 3) == 0 || memcmp(name, "RLO", 3) == 0 ||
+          memcmp(name, "LRI", 3) == 0 || memcmp(name, "RLI", 3) == 0 ||
+          memcmp(name, "FSI", 3) == 0 || memcmp(name, "PDI", 3) == 0))) {
         /*
          * Mark all of these as Other Neutral to preserve compatibility with
          * older versions.
@@ -350,8 +352,10 @@ ordered_range_insert(ac_uint4 c, char *name, int len)
           break;
     }
 
-    if (i == NUMPROPS)
-      return;
+    if (i == NUMPROPS) {
+        printf("Unknown property %s\n", name);
+        return;
+    }
 
     /*
      * Have a match, so insert the code in order.
diff --git a/ext/mbstring/unicode_data.h b/ext/mbstring/unicode_data.h
index c176128cf14..580caaaf7cb 100644
--- a/ext/mbstring/unicode_data.h
+++ b/ext/mbstring/unicode_data.h
@@ -1887,7 +1887,7 @@ static const unsigned int _ucprop_ranges[] = {
 	0x0000200b, 0x0000200d, 0x00002010, 0x00002027,
 	0x0000202a, 0x0000202e, 0x00002035, 0x00002043,
 	0x00002045, 0x0000205e, 0x00002060, 0x00002064,
-	0x0000206a, 0x0000206f, 0x0000207c, 0x0000207e,
+	0x00002066, 0x0000206f, 0x0000207c, 0x0000207e,
 	0x0000208c, 0x0000208e, 0x000020d0, 0x000020f0,
 	0x00002100, 0x00002101, 0x00002103, 0x00002106,
 	0x00002108, 0x00002109, 0x00002114, 0x00002114,