Index: share/ctypedef/C.UTF-8.src
===================================================================
--- share/ctypedef/C.UTF-8.src
+++ share/ctypedef/C.UTF-8.src
@@ -16434,7 +16434,6 @@
 	<ACTIVATE_ARABIC_FORM_SHAPING>;/
 	<NATIONAL_DIGIT_SHAPES>;/
 	<NOMINAL_DIGIT_SHAPES>;/
-	<PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/
 	<ZERO_WIDTH_NO-BREAK_SPACE>;/
 	<INTERLINEAR_ANNOTATION_ANCHOR>;/
 	<INTERLINEAR_ANNOTATION_SEPARATOR>;/
@@ -16549,9 +16548,7 @@
 	<TAG_VERTICAL_LINE>;/
 	<TAG_RIGHT_CURLY_BRACKET>;/
 	<TAG_TILDE>;/
-	<CANCEL_TAG>;/
-	<PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/
-	<PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD>
+	<CANCEL_TAG>
 digit	<zero>;/
 	<one>;/
 	<two>;/
@@ -22555,6 +22552,7 @@
 	<MEETEI_MAYEK_VOWEL_SIGN_NUNG>;/
 	<MEETEI_MAYEK_LUM_IYEK>;/
 	<MEETEI_MAYEK_APUN_IYEK>;/
+	<PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/
 	<HEBREW_POINT_JUDEO-SPANISH_VARIKA>;/
 	<HEBREW_LETTER_ALTERNATIVE_PLUS_SIGN>;/
 	<ARABIC_SYMBOL_DOT_ABOVE>;/
@@ -27547,7 +27545,9 @@
 	<VARIATION_SELECTOR-253>;/
 	<VARIATION_SELECTOR-254>;/
 	<VARIATION_SELECTOR-255>;/
-	<VARIATION_SELECTOR-256>
+	<VARIATION_SELECTOR-256>;/
+	<PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/
+	<PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD>
 lower	<a>;/
 	<b>;/
 	<c>;/
Index: tools/tools/locale/tools/utf8-rollup.pl
===================================================================
--- tools/tools/locale/tools/utf8-rollup.pl
+++ tools/tools/locale/tools/utf8-rollup.pl
@@ -161,7 +161,8 @@
 			$cat = "alpha";
 		} elsif ($d[2] =~ /^P/) {
 			$cat = "punct";
-		} elsif ($d[2] =~ /^M/ || $d[2] =~ /^N/ || $d[2] =~ /^S/) {
+		} elsif ($d[2] =~ /^Co/ || $d[2] =~ /^M/ || $d[2] =~ /^N/ ||
+		    $d[2] =~ /^S/) {
 			$cat = "graph";
 		} elsif ($d[2] =~ /^C/) {
 			$cat = "cntrl";