diff --git a/ChangeLog b/ChangeLog
index 1352ca0f2..29c7d4722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-05-10  Sascha Brawer  <sascha@google.com>
+	    Werner Lemberg  <wl@gnu.org
+
+	[autofit] Add support for Bamum script.
+
+	* src/autofit/afblue.dat: Add blue zone data for Bamum.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/afscript.h: Add Bamum standard character.
+
+	* src/autofit/afranges.c, src/autofit/afstyles.h: Add Bamum data.
+
 2017-05-10  Sascha Brawer  <sascha@google.com>
 	    Werner Lemberg  <wl@gnu.org
 
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index 56572996b..ced3a7735 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -56,6 +56,10 @@
     '\0',
     '\xF0', '\x90', '\xAC', '\x80', ' ', '\xF0', '\x90', '\xAC', '\x81',  /* 𐬀 𐬁 */
     '\0',
+    '\xEA', '\x9A', '\xA7', ' ', '\xEA', '\x9A', '\xA8', ' ', '\xEA', '\x9B', '\x9B', ' ', '\xEA', '\x9B', '\x89', ' ', '\xEA', '\x9B', '\x81', ' ', '\xEA', '\x9B', '\x88', ' ', '\xEA', '\x9B', '\xAB', ' ', '\xEA', '\x9B', '\xAF',  /* ꚧ ꚨ ꛛ ꛉ ꛁ ꛈ ꛫ ꛯ */
+    '\0',
+    '\xEA', '\x9A', '\xAD', ' ', '\xEA', '\x9A', '\xB3', ' ', '\xEA', '\x9A', '\xB6', ' ', '\xEA', '\x9B', '\xAC', ' ', '\xEA', '\x9A', '\xA2', ' ', '\xEA', '\x9A', '\xBD', ' ', '\xEA', '\x9B', '\xAF', ' ', '\xEA', '\x9B', '\xB2',  /* ꚭ ꚳ ꚶ ꛬ ꚢ ꚽ ꛯ ꛲ */
+    '\0',
     '\xE0', '\xA6', '\x85', ' ', '\xE0', '\xA6', '\xA1', ' ', '\xE0', '\xA6', '\xA4', ' ', '\xE0', '\xA6', '\xA8', ' ', '\xE0', '\xA6', '\xAC', ' ', '\xE0', '\xA6', '\xAD', ' ', '\xE0', '\xA6', '\xB2', ' ', '\xE0', '\xA6', '\x95',  /* অ ড ত ন ব ভ ল ক */
     '\0',
     '\xE0', '\xA6', '\x87', ' ', '\xE0', '\xA6', '\x9F', ' ', '\xE0', '\xA6', '\xA0', ' ', '\xE0', '\xA6', '\xBF', ' ', '\xE0', '\xA7', '\x80', ' ', '\xE0', '\xA7', '\x88', ' ', '\xE0', '\xA7', '\x97',  /* ই ট ঠ ি ী ৈ ৗ */
@@ -440,6 +444,9 @@
     { AF_BLUE_STRING_AVESTAN_TOP,    AF_BLUE_PROPERTY_LATIN_TOP },
     { AF_BLUE_STRING_AVESTAN_BOTTOM, 0                          },
     { AF_BLUE_STRING_MAX,            0                          },
+    { AF_BLUE_STRING_BAMUM_TOP,    AF_BLUE_PROPERTY_LATIN_TOP },
+    { AF_BLUE_STRING_BAMUM_BOTTOM, 0                          },
+    { AF_BLUE_STRING_MAX,          0                          },
     { AF_BLUE_STRING_BENGALI_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        },
     { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP        },
     { AF_BLUE_STRING_BENGALI_BASE, AF_BLUE_PROPERTY_LATIN_TOP      |
diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat
index dbb28b9da..91626a0d5 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -113,6 +113,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
   AF_BLUE_STRING_AVESTAN_BOTTOM
     "𐬀 𐬁"
 
+  AF_BLUE_STRING_BAMUM_TOP
+    "ꚧ ꚨ ꛛ ꛉ ꛁ ꛈ ꛫ ꛯ"
+  AF_BLUE_STRING_BAMUM_BOTTOM
+    "ꚭ ꚳ ꚶ ꛬ ꚢ ꚽ ꛯ ꛲"
+
   AF_BLUE_STRING_BENGALI_BASE
     "অ ড ত ন ব ভ ল ক"
   AF_BLUE_STRING_BENGALI_TOP
@@ -672,6 +677,11 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
     { AF_BLUE_STRING_AVESTAN_BOTTOM, 0                          }
     { AF_BLUE_STRING_MAX,            0                          }
 
+  AF_BLUE_STRINGSET_BAMU
+    { AF_BLUE_STRING_BAMUM_TOP,    AF_BLUE_PROPERTY_LATIN_TOP }
+    { AF_BLUE_STRING_BAMUM_BOTTOM, 0                          }
+    { AF_BLUE_STRING_MAX,          0                          }
+
   AF_BLUE_STRINGSET_BENG
     { AF_BLUE_STRING_BENGALI_TOP,  AF_BLUE_PROPERTY_LATIN_TOP        }
     { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP        }
diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h
index 18d8f124a..4915f68d1 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -92,164 +92,166 @@ FT_BEGIN_HEADER
     AF_BLUE_STRING_ARMENIAN_SMALL_DESCENDER = 258,
     AF_BLUE_STRING_AVESTAN_TOP = 282,
     AF_BLUE_STRING_AVESTAN_BOTTOM = 302,
-    AF_BLUE_STRING_BENGALI_BASE = 312,
-    AF_BLUE_STRING_BENGALI_TOP = 344,
-    AF_BLUE_STRING_BENGALI_HEAD = 372,
-    AF_BLUE_STRING_BUHID_TOP = 404,
-    AF_BLUE_STRING_BUHID_LARGE = 412,
-    AF_BLUE_STRING_BUHID_SMALL = 424,
-    AF_BLUE_STRING_BUHID_BOTTOM = 440,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP = 468,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM = 500,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP = 532,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM = 564,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP = 596,
-    AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM = 624,
-    AF_BLUE_STRING_CARIAN_TOP = 656,
-    AF_BLUE_STRING_CARIAN_BOTTOM = 696,
-    AF_BLUE_STRING_CHEROKEE_CAPITAL = 731,
-    AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 763,
-    AF_BLUE_STRING_CHEROKEE_SMALL = 795,
-    AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 827,
-    AF_BLUE_STRING_COPTIC_CAPITAL_TOP = 843,
-    AF_BLUE_STRING_COPTIC_CAPITAL_BOTTOM = 875,
-    AF_BLUE_STRING_COPTIC_SMALL_TOP = 907,
-    AF_BLUE_STRING_COPTIC_SMALL_BOTTOM = 939,
-    AF_BLUE_STRING_CYPRIOT_TOP = 971,
-    AF_BLUE_STRING_CYPRIOT_BOTTOM = 1011,
-    AF_BLUE_STRING_CYPRIOT_SMALL = 1046,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 1061,
-    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 1085,
-    AF_BLUE_STRING_CYRILLIC_SMALL = 1109,
-    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 1133,
-    AF_BLUE_STRING_DESERET_CAPITAL_TOP = 1142,
-    AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 1167,
-    AF_BLUE_STRING_DESERET_SMALL_TOP = 1192,
-    AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 1217,
-    AF_BLUE_STRING_DEVANAGARI_BASE = 1242,
-    AF_BLUE_STRING_DEVANAGARI_TOP = 1274,
-    AF_BLUE_STRING_DEVANAGARI_HEAD = 1306,
-    AF_BLUE_STRING_DEVANAGARI_BOTTOM = 1338,
-    AF_BLUE_STRING_ETHIOPIC_TOP = 1346,
-    AF_BLUE_STRING_ETHIOPIC_BOTTOM = 1378,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 1410,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 1442,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 1474,
-    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 1506,
-    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 1538,
-    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 1570,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1602,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1634,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1666,
-    AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1698,
-    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1730,
-    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1762,
-    AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1794,
-    AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1826,
-    AF_BLUE_STRING_GOTHIC_TOP = 1858,
-    AF_BLUE_STRING_GOTHIC_BOTTOM = 1898,
-    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1918,
-    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 1939,
-    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 1957,
-    AF_BLUE_STRING_GREEK_SMALL = 1975,
-    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 1999,
-    AF_BLUE_STRING_GUJARATI_TOP = 2023,
-    AF_BLUE_STRING_GUJARATI_BOTTOM = 2055,
-    AF_BLUE_STRING_GUJARATI_ASCENDER = 2087,
-    AF_BLUE_STRING_GUJARATI_DESCENDER = 2137,
-    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2170,
-    AF_BLUE_STRING_GURMUKHI_BASE = 2190,
-    AF_BLUE_STRING_GURMUKHI_HEAD = 2222,
-    AF_BLUE_STRING_GURMUKHI_TOP = 2254,
-    AF_BLUE_STRING_GURMUKHI_BOTTOM = 2286,
-    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2318,
-    AF_BLUE_STRING_HEBREW_TOP = 2338,
-    AF_BLUE_STRING_HEBREW_BOTTOM = 2362,
-    AF_BLUE_STRING_HEBREW_DESCENDER = 2380,
-    AF_BLUE_STRING_KANNADA_TOP = 2395,
-    AF_BLUE_STRING_KANNADA_BOTTOM = 2439,
-    AF_BLUE_STRING_KHMER_TOP = 2471,
-    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2495,
-    AF_BLUE_STRING_KHMER_BOTTOM = 2535,
-    AF_BLUE_STRING_KHMER_DESCENDER = 2567,
-    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2601,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2688,
-    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2696,
-    AF_BLUE_STRING_LAO_TOP = 2704,
-    AF_BLUE_STRING_LAO_BOTTOM = 2736,
-    AF_BLUE_STRING_LAO_ASCENDER = 2768,
-    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2784,
-    AF_BLUE_STRING_LAO_DESCENDER = 2796,
-    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2820,
-    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2836,
-    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2852,
-    AF_BLUE_STRING_LATIN_SMALL_TOP = 2866,
-    AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2882,
-    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2898,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2908,
-    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2928,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 2948,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL = 2968,
-    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3004,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3024,
-    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3055,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3084,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL = 3110,
-    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3135,
-    AF_BLUE_STRING_LISU_TOP = 3146,
-    AF_BLUE_STRING_LISU_BOTTOM = 3178,
-    AF_BLUE_STRING_MALAYALAM_TOP = 3210,
-    AF_BLUE_STRING_MALAYALAM_BOTTOM = 3254,
-    AF_BLUE_STRING_MYANMAR_TOP = 3286,
-    AF_BLUE_STRING_MYANMAR_BOTTOM = 3318,
-    AF_BLUE_STRING_MYANMAR_ASCENDER = 3350,
-    AF_BLUE_STRING_MYANMAR_DESCENDER = 3378,
-    AF_BLUE_STRING_NKO_TOP = 3410,
-    AF_BLUE_STRING_NKO_BOTTOM = 3434,
-    AF_BLUE_STRING_NKO_SMALL_TOP = 3449,
-    AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3458,
-    AF_BLUE_STRING_OL_CHIKI = 3470,
-    AF_BLUE_STRING_OLD_TURKIC_TOP = 3494,
-    AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3509,
-    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3529,
-    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3569,
-    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3599,
-    AF_BLUE_STRING_OSAGE_SMALL_TOP = 3614,
-    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3654,
-    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3694,
-    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3719,
-    AF_BLUE_STRING_OSMANYA_TOP = 3734,
-    AF_BLUE_STRING_OSMANYA_BOTTOM = 3774,
-    AF_BLUE_STRING_SAURASHTRA_TOP = 3814,
-    AF_BLUE_STRING_SAURASHTRA_BOTTOM = 3846,
-    AF_BLUE_STRING_SHAVIAN_TOP = 3866,
-    AF_BLUE_STRING_SHAVIAN_BOTTOM = 3876,
-    AF_BLUE_STRING_SHAVIAN_DESCENDER = 3901,
-    AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 3911,
-    AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 3946,
-    AF_BLUE_STRING_SINHALA_TOP = 3961,
-    AF_BLUE_STRING_SINHALA_BOTTOM = 3993,
-    AF_BLUE_STRING_SINHALA_DESCENDER = 4025,
-    AF_BLUE_STRING_SUNDANESE_TOP = 4069,
-    AF_BLUE_STRING_SUNDANESE_BOTTOM = 4093,
-    AF_BLUE_STRING_SUNDANESE_DESCENDER = 4125,
-    AF_BLUE_STRING_TAI_VIET_TOP = 4133,
-    AF_BLUE_STRING_TAI_VIET_BOTTOM = 4153,
-    AF_BLUE_STRING_TAMIL_TOP = 4165,
-    AF_BLUE_STRING_TAMIL_BOTTOM = 4197,
-    AF_BLUE_STRING_TELUGU_TOP = 4229,
-    AF_BLUE_STRING_TELUGU_BOTTOM = 4257,
-    AF_BLUE_STRING_THAI_TOP = 4285,
-    AF_BLUE_STRING_THAI_BOTTOM = 4309,
-    AF_BLUE_STRING_THAI_ASCENDER = 4337,
-    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4349,
-    AF_BLUE_STRING_THAI_DESCENDER = 4361,
-    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4377,
-    AF_BLUE_STRING_THAI_DIGIT_TOP = 4385,
-    AF_BLUE_STRING_TIFINAGH = 4397,
-    AF_BLUE_STRING_VAI_TOP = 4429,
-    AF_BLUE_STRING_VAI_BOTTOM = 4461,
-    af_blue_1_1 = 4492,
+    AF_BLUE_STRING_BAMUM_TOP = 312,
+    AF_BLUE_STRING_BAMUM_BOTTOM = 344,
+    AF_BLUE_STRING_BENGALI_BASE = 376,
+    AF_BLUE_STRING_BENGALI_TOP = 408,
+    AF_BLUE_STRING_BENGALI_HEAD = 436,
+    AF_BLUE_STRING_BUHID_TOP = 468,
+    AF_BLUE_STRING_BUHID_LARGE = 476,
+    AF_BLUE_STRING_BUHID_SMALL = 488,
+    AF_BLUE_STRING_BUHID_BOTTOM = 504,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP = 532,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM = 564,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP = 596,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM = 628,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP = 660,
+    AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM = 688,
+    AF_BLUE_STRING_CARIAN_TOP = 720,
+    AF_BLUE_STRING_CARIAN_BOTTOM = 760,
+    AF_BLUE_STRING_CHEROKEE_CAPITAL = 795,
+    AF_BLUE_STRING_CHEROKEE_SMALL_ASCENDER = 827,
+    AF_BLUE_STRING_CHEROKEE_SMALL = 859,
+    AF_BLUE_STRING_CHEROKEE_SMALL_DESCENDER = 891,
+    AF_BLUE_STRING_COPTIC_CAPITAL_TOP = 907,
+    AF_BLUE_STRING_COPTIC_CAPITAL_BOTTOM = 939,
+    AF_BLUE_STRING_COPTIC_SMALL_TOP = 971,
+    AF_BLUE_STRING_COPTIC_SMALL_BOTTOM = 1003,
+    AF_BLUE_STRING_CYPRIOT_TOP = 1035,
+    AF_BLUE_STRING_CYPRIOT_BOTTOM = 1075,
+    AF_BLUE_STRING_CYPRIOT_SMALL = 1110,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP = 1125,
+    AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM = 1149,
+    AF_BLUE_STRING_CYRILLIC_SMALL = 1173,
+    AF_BLUE_STRING_CYRILLIC_SMALL_DESCENDER = 1197,
+    AF_BLUE_STRING_DESERET_CAPITAL_TOP = 1206,
+    AF_BLUE_STRING_DESERET_CAPITAL_BOTTOM = 1231,
+    AF_BLUE_STRING_DESERET_SMALL_TOP = 1256,
+    AF_BLUE_STRING_DESERET_SMALL_BOTTOM = 1281,
+    AF_BLUE_STRING_DEVANAGARI_BASE = 1306,
+    AF_BLUE_STRING_DEVANAGARI_TOP = 1338,
+    AF_BLUE_STRING_DEVANAGARI_HEAD = 1370,
+    AF_BLUE_STRING_DEVANAGARI_BOTTOM = 1402,
+    AF_BLUE_STRING_ETHIOPIC_TOP = 1410,
+    AF_BLUE_STRING_ETHIOPIC_BOTTOM = 1442,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_TOP = 1474,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_BOTTOM = 1506,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER = 1538,
+    AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER = 1570,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP = 1602,
+    AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM = 1634,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP = 1666,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM = 1698,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER = 1730,
+    AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER = 1762,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_TOP = 1794,
+    AF_BLUE_STRING_GLAGOLITIC_CAPITAL_BOTTOM = 1826,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_TOP = 1858,
+    AF_BLUE_STRING_GLAGOLITIC_SMALL_BOTTOM = 1890,
+    AF_BLUE_STRING_GOTHIC_TOP = 1922,
+    AF_BLUE_STRING_GOTHIC_BOTTOM = 1962,
+    AF_BLUE_STRING_GREEK_CAPITAL_TOP = 1982,
+    AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM = 2003,
+    AF_BLUE_STRING_GREEK_SMALL_BETA_TOP = 2021,
+    AF_BLUE_STRING_GREEK_SMALL = 2039,
+    AF_BLUE_STRING_GREEK_SMALL_DESCENDER = 2063,
+    AF_BLUE_STRING_GUJARATI_TOP = 2087,
+    AF_BLUE_STRING_GUJARATI_BOTTOM = 2119,
+    AF_BLUE_STRING_GUJARATI_ASCENDER = 2151,
+    AF_BLUE_STRING_GUJARATI_DESCENDER = 2201,
+    AF_BLUE_STRING_GUJARATI_DIGIT_TOP = 2234,
+    AF_BLUE_STRING_GURMUKHI_BASE = 2254,
+    AF_BLUE_STRING_GURMUKHI_HEAD = 2286,
+    AF_BLUE_STRING_GURMUKHI_TOP = 2318,
+    AF_BLUE_STRING_GURMUKHI_BOTTOM = 2350,
+    AF_BLUE_STRING_GURMUKHI_DIGIT_TOP = 2382,
+    AF_BLUE_STRING_HEBREW_TOP = 2402,
+    AF_BLUE_STRING_HEBREW_BOTTOM = 2426,
+    AF_BLUE_STRING_HEBREW_DESCENDER = 2444,
+    AF_BLUE_STRING_KANNADA_TOP = 2459,
+    AF_BLUE_STRING_KANNADA_BOTTOM = 2503,
+    AF_BLUE_STRING_KHMER_TOP = 2535,
+    AF_BLUE_STRING_KHMER_SUBSCRIPT_TOP = 2559,
+    AF_BLUE_STRING_KHMER_BOTTOM = 2599,
+    AF_BLUE_STRING_KHMER_DESCENDER = 2631,
+    AF_BLUE_STRING_KHMER_LARGE_DESCENDER = 2665,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WAXING_TOP = 2752,
+    AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM = 2760,
+    AF_BLUE_STRING_LAO_TOP = 2768,
+    AF_BLUE_STRING_LAO_BOTTOM = 2800,
+    AF_BLUE_STRING_LAO_ASCENDER = 2832,
+    AF_BLUE_STRING_LAO_LARGE_ASCENDER = 2848,
+    AF_BLUE_STRING_LAO_DESCENDER = 2860,
+    AF_BLUE_STRING_LATIN_CAPITAL_TOP = 2884,
+    AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM = 2900,
+    AF_BLUE_STRING_LATIN_SMALL_F_TOP = 2916,
+    AF_BLUE_STRING_LATIN_SMALL_TOP = 2930,
+    AF_BLUE_STRING_LATIN_SMALL_BOTTOM = 2946,
+    AF_BLUE_STRING_LATIN_SMALL_DESCENDER = 2962,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_TOP = 2972,
+    AF_BLUE_STRING_LATIN_SUBS_CAPITAL_BOTTOM = 2992,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_F_TOP = 3012,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL = 3032,
+    AF_BLUE_STRING_LATIN_SUBS_SMALL_DESCENDER = 3068,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_TOP = 3088,
+    AF_BLUE_STRING_LATIN_SUPS_CAPITAL_BOTTOM = 3119,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_F_TOP = 3148,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL = 3174,
+    AF_BLUE_STRING_LATIN_SUPS_SMALL_DESCENDER = 3199,
+    AF_BLUE_STRING_LISU_TOP = 3210,
+    AF_BLUE_STRING_LISU_BOTTOM = 3242,
+    AF_BLUE_STRING_MALAYALAM_TOP = 3274,
+    AF_BLUE_STRING_MALAYALAM_BOTTOM = 3318,
+    AF_BLUE_STRING_MYANMAR_TOP = 3350,
+    AF_BLUE_STRING_MYANMAR_BOTTOM = 3382,
+    AF_BLUE_STRING_MYANMAR_ASCENDER = 3414,
+    AF_BLUE_STRING_MYANMAR_DESCENDER = 3442,
+    AF_BLUE_STRING_NKO_TOP = 3474,
+    AF_BLUE_STRING_NKO_BOTTOM = 3498,
+    AF_BLUE_STRING_NKO_SMALL_TOP = 3513,
+    AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3522,
+    AF_BLUE_STRING_OL_CHIKI = 3534,
+    AF_BLUE_STRING_OLD_TURKIC_TOP = 3558,
+    AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3573,
+    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3593,
+    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3633,
+    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3663,
+    AF_BLUE_STRING_OSAGE_SMALL_TOP = 3678,
+    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3718,
+    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3758,
+    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3783,
+    AF_BLUE_STRING_OSMANYA_TOP = 3798,
+    AF_BLUE_STRING_OSMANYA_BOTTOM = 3838,
+    AF_BLUE_STRING_SAURASHTRA_TOP = 3878,
+    AF_BLUE_STRING_SAURASHTRA_BOTTOM = 3910,
+    AF_BLUE_STRING_SHAVIAN_TOP = 3930,
+    AF_BLUE_STRING_SHAVIAN_BOTTOM = 3940,
+    AF_BLUE_STRING_SHAVIAN_DESCENDER = 3965,
+    AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 3975,
+    AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4010,
+    AF_BLUE_STRING_SINHALA_TOP = 4025,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 4057,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 4089,
+    AF_BLUE_STRING_SUNDANESE_TOP = 4133,
+    AF_BLUE_STRING_SUNDANESE_BOTTOM = 4157,
+    AF_BLUE_STRING_SUNDANESE_DESCENDER = 4189,
+    AF_BLUE_STRING_TAI_VIET_TOP = 4197,
+    AF_BLUE_STRING_TAI_VIET_BOTTOM = 4217,
+    AF_BLUE_STRING_TAMIL_TOP = 4229,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 4261,
+    AF_BLUE_STRING_TELUGU_TOP = 4293,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 4321,
+    AF_BLUE_STRING_THAI_TOP = 4349,
+    AF_BLUE_STRING_THAI_BOTTOM = 4373,
+    AF_BLUE_STRING_THAI_ASCENDER = 4401,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4413,
+    AF_BLUE_STRING_THAI_DESCENDER = 4425,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4441,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 4449,
+    AF_BLUE_STRING_TIFINAGH = 4461,
+    AF_BLUE_STRING_VAI_TOP = 4493,
+    AF_BLUE_STRING_VAI_BOTTOM = 4525,
+    af_blue_1_1 = 4556,
 #ifdef AF_CONFIG_OPTION_CJK
     AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1,
     AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203,
@@ -312,52 +314,53 @@ FT_BEGIN_HEADER
     AF_BLUE_STRINGSET_ARAB = 5,
     AF_BLUE_STRINGSET_ARMN = 9,
     AF_BLUE_STRINGSET_AVST = 16,
-    AF_BLUE_STRINGSET_BENG = 19,
-    AF_BLUE_STRINGSET_BUHD = 24,
-    AF_BLUE_STRINGSET_CANADIAN_SYLLABICS = 29,
-    AF_BLUE_STRINGSET_CARI = 36,
-    AF_BLUE_STRINGSET_CHER = 39,
-    AF_BLUE_STRINGSET_COPT = 46,
-    AF_BLUE_STRINGSET_CPRT = 51,
-    AF_BLUE_STRINGSET_CYRL = 56,
-    AF_BLUE_STRINGSET_DEVA = 62,
-    AF_BLUE_STRINGSET_DSRT = 68,
-    AF_BLUE_STRINGSET_ETHI = 73,
-    AF_BLUE_STRINGSET_GEOR = 76,
-    AF_BLUE_STRINGSET_GEOK = 81,
-    AF_BLUE_STRINGSET_GLAG = 88,
-    AF_BLUE_STRINGSET_GOTH = 93,
-    AF_BLUE_STRINGSET_GREK = 96,
-    AF_BLUE_STRINGSET_GUJR = 103,
-    AF_BLUE_STRINGSET_GURU = 109,
-    AF_BLUE_STRINGSET_HEBR = 115,
-    AF_BLUE_STRINGSET_KNDA = 119,
-    AF_BLUE_STRINGSET_KHMR = 122,
-    AF_BLUE_STRINGSET_KHMS = 128,
-    AF_BLUE_STRINGSET_LAO = 131,
-    AF_BLUE_STRINGSET_LATN = 137,
-    AF_BLUE_STRINGSET_LATB = 144,
-    AF_BLUE_STRINGSET_LATP = 151,
-    AF_BLUE_STRINGSET_LISU = 158,
-    AF_BLUE_STRINGSET_MLYM = 161,
-    AF_BLUE_STRINGSET_MYMR = 164,
-    AF_BLUE_STRINGSET_NKOO = 169,
-    AF_BLUE_STRINGSET_NONE = 174,
-    AF_BLUE_STRINGSET_OLCK = 175,
-    AF_BLUE_STRINGSET_ORKH = 178,
-    AF_BLUE_STRINGSET_OSGE = 181,
-    AF_BLUE_STRINGSET_OSMA = 189,
-    AF_BLUE_STRINGSET_SAUR = 192,
-    AF_BLUE_STRINGSET_SHAW = 195,
-    AF_BLUE_STRINGSET_SINH = 201,
-    AF_BLUE_STRINGSET_SUND = 205,
-    AF_BLUE_STRINGSET_TAML = 209,
-    AF_BLUE_STRINGSET_TAVT = 212,
-    AF_BLUE_STRINGSET_TELU = 215,
-    AF_BLUE_STRINGSET_THAI = 218,
-    AF_BLUE_STRINGSET_TFNG = 226,
-    AF_BLUE_STRINGSET_VAII = 229,
-    af_blue_2_1 = 232,
+    AF_BLUE_STRINGSET_BAMU = 19,
+    AF_BLUE_STRINGSET_BENG = 22,
+    AF_BLUE_STRINGSET_BUHD = 27,
+    AF_BLUE_STRINGSET_CANADIAN_SYLLABICS = 32,
+    AF_BLUE_STRINGSET_CARI = 39,
+    AF_BLUE_STRINGSET_CHER = 42,
+    AF_BLUE_STRINGSET_COPT = 49,
+    AF_BLUE_STRINGSET_CPRT = 54,
+    AF_BLUE_STRINGSET_CYRL = 59,
+    AF_BLUE_STRINGSET_DEVA = 65,
+    AF_BLUE_STRINGSET_DSRT = 71,
+    AF_BLUE_STRINGSET_ETHI = 76,
+    AF_BLUE_STRINGSET_GEOR = 79,
+    AF_BLUE_STRINGSET_GEOK = 84,
+    AF_BLUE_STRINGSET_GLAG = 91,
+    AF_BLUE_STRINGSET_GOTH = 96,
+    AF_BLUE_STRINGSET_GREK = 99,
+    AF_BLUE_STRINGSET_GUJR = 106,
+    AF_BLUE_STRINGSET_GURU = 112,
+    AF_BLUE_STRINGSET_HEBR = 118,
+    AF_BLUE_STRINGSET_KNDA = 122,
+    AF_BLUE_STRINGSET_KHMR = 125,
+    AF_BLUE_STRINGSET_KHMS = 131,
+    AF_BLUE_STRINGSET_LAO = 134,
+    AF_BLUE_STRINGSET_LATN = 140,
+    AF_BLUE_STRINGSET_LATB = 147,
+    AF_BLUE_STRINGSET_LATP = 154,
+    AF_BLUE_STRINGSET_LISU = 161,
+    AF_BLUE_STRINGSET_MLYM = 164,
+    AF_BLUE_STRINGSET_MYMR = 167,
+    AF_BLUE_STRINGSET_NKOO = 172,
+    AF_BLUE_STRINGSET_NONE = 177,
+    AF_BLUE_STRINGSET_OLCK = 178,
+    AF_BLUE_STRINGSET_ORKH = 181,
+    AF_BLUE_STRINGSET_OSGE = 184,
+    AF_BLUE_STRINGSET_OSMA = 192,
+    AF_BLUE_STRINGSET_SAUR = 195,
+    AF_BLUE_STRINGSET_SHAW = 198,
+    AF_BLUE_STRINGSET_SINH = 204,
+    AF_BLUE_STRINGSET_SUND = 208,
+    AF_BLUE_STRINGSET_TAML = 212,
+    AF_BLUE_STRINGSET_TAVT = 215,
+    AF_BLUE_STRINGSET_TELU = 218,
+    AF_BLUE_STRINGSET_THAI = 221,
+    AF_BLUE_STRINGSET_TFNG = 229,
+    AF_BLUE_STRINGSET_VAII = 232,
+    af_blue_2_1 = 235,
 #ifdef AF_CONFIG_OPTION_CJK
     AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0,
     af_blue_2_1_1 = af_blue_2_1 + 2,
diff --git a/src/autofit/afranges.c b/src/autofit/afranges.c
index 6f9a6b085..a96e6cb61 100644
--- a/src/autofit/afranges.c
+++ b/src/autofit/afranges.c
@@ -132,6 +132,24 @@
   };
 
 
+  const AF_Script_UniRangeRec  af_bamu_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0xA6A0,   0xA6FF ),   /* Bamum */
+#if 0
+    /* The characters in the Bamum supplement are pictograms, */
+    /* not (directly) related to the syllabic Bamum script    */
+    AF_UNIRANGE_REC( 0x16800, 0x16A3F ),   /* Bamum Supplement */
+#endif
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+  const AF_Script_UniRangeRec  af_bamu_nonbase_uniranges[] =
+  {
+    AF_UNIRANGE_REC(  0xA6F0,  0xA6F1 ),
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+
   const AF_Script_UniRangeRec  af_beng_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0980,  0x09FF ),  /* Bengali */
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index b22a4896e..90facd2e0 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -54,6 +54,12 @@
           HINTING_BOTTOM_TO_TOP,
           "\xF0\x90\xAC\x9A" ) /* 𐬚 */
 
+  SCRIPT( bamu, BAMU,
+          "Bamum",
+          HB_SCRIPT_BAMUM,
+          HINTING_BOTTOM_TO_TOP,
+          "\xEA\x9B\x81 \xEA\x9B\xAF" ) /* ꛁ ꛯ */
+
   /* there are no simple forms for letters; we thus use two digit shapes */
   SCRIPT( beng, BENG,
           "Bengali",
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index e53a25ad8..d4784e000 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -111,6 +111,13 @@
          AF_BLUE_STRINGSET_AVST,
          AF_COVERAGE_DEFAULT )
 
+  STYLE( bamu_dflt, BAMU_DFLT,
+         "Bamum default style",
+         AF_WRITING_SYSTEM_LATIN,
+         AF_SCRIPT_BAMU,
+         AF_BLUE_STRINGSET_BAMU,
+         AF_COVERAGE_DEFAULT )
+
   STYLE( beng_dflt, BENG_DFLT,
          "Bengali default style",
          AF_WRITING_SYSTEM_LATIN,