diff --git a/third_party/color_emoji/add_glyphs.py b/third_party/color_emoji/add_glyphs.py
index 77d5c7e89..7f7b4f8cd 100644
--- a/third_party/color_emoji/add_glyphs.py
+++ b/third_party/color_emoji/add_glyphs.py
@@ -85,9 +85,9 @@ EXTRA_SEQUENCES = {
 # Flag aliases - from: to
 FLAG_ALIASES = {
     'BV': 'NO',
-    'SJ': 'NO',
-    'UM': 'FR',
+    'CP': 'FR',
     'HM': 'AU',
+    'SJ': 'NO',
     'UM': 'US',
 }
 
diff --git a/third_party/color_emoji/emoji_builder.py b/third_party/color_emoji/emoji_builder.py
index fa9f4115c..c847fdbf8 100644
--- a/third_party/color_emoji/emoji_builder.py
+++ b/third_party/color_emoji/emoji_builder.py
@@ -23,6 +23,8 @@ from png import PNG
 import os
 from os import path
 
+from nototools import font_data
+
 def get_glyph_name_from_gsub (string, font, cmap_dict):
 	ligatures = font['GSUB'].table.LookupList.Lookup[0].SubTable[0].ligatures
 	first_glyph = cmap_dict[ord (string[0])]
@@ -527,6 +529,11 @@ By default they are dropped.
 		drop_outline_tables (font)
 		print "Dropped outline ('glyf', 'CFF ') and related tables."
 
+        # hack removal of cmap pua entry for unknown flag glyph.  If we try to
+        # remove it earlier, getGlyphID dies.  Need to restructure all of this
+        # code.
+        font_data.delete_from_cmap(font, [0xfe82b])
+
 	font.save (out_file)
 	print "Output font '%s' generated." % out_file