diff --git a/ChangeLog b/ChangeLog
index e2bf18f6b..e3a61c8f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-05-08  Sascha Brawer  <sascha@google.com>
+	    Werner Lemberg  <wl@gnu.org
+
+	[autofit] Add support for Osmanya script.
+
+	* src/autofit/afblue.dat: Add blue zone data for Osmanya.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/afscript.h: Add Osmanya standard character.
+
+	* src/autofit/afranges.c, src/autofit/afstyles.h: Add Osmanya data.
+
 2017-05-08  Sascha Brawer  <sascha@google.com>
 	    Werner Lemberg  <wl@gnu.org
 
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index 4015395a5..41be50fc3 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -300,6 +300,10 @@
     '\0',
     '\xF0', '\x90', '\x93', '\xA4', ' ', '\xF0', '\x90', '\x93', '\xA5', ' ', '\xF0', '\x90', '\x93', '\xA6',  /* 𐓤 𐓥 𐓦 */
     '\0',
+    '\xF0', '\x90', '\x92', '\x86', ' ', '\xF0', '\x90', '\x92', '\x89', ' ', '\xF0', '\x90', '\x92', '\x90', ' ', '\xF0', '\x90', '\x92', '\x92', ' ', '\xF0', '\x90', '\x92', '\x98', ' ', '\xF0', '\x90', '\x92', '\x9B', ' ', '\xF0', '\x90', '\x92', '\xA0', ' ', '\xF0', '\x90', '\x92', '\xA3',  /* 𐒆 𐒉 𐒐 𐒒 𐒘 𐒛 𐒠 𐒣 */
+    '\0',
+    '\xF0', '\x90', '\x92', '\x80', ' ', '\xF0', '\x90', '\x92', '\x82', ' ', '\xF0', '\x90', '\x92', '\x86', ' ', '\xF0', '\x90', '\x92', '\x88', ' ', '\xF0', '\x90', '\x92', '\x8A', ' ', '\xF0', '\x90', '\x92', '\x92', ' ', '\xF0', '\x90', '\x92', '\xA0', ' ', '\xF0', '\x90', '\x92', '\xA9',  /* 𐒀 𐒂 𐒆 𐒈 𐒊 𐒒 𐒠 𐒩 */
+    '\0',
     '\xE0', '\xB6', '\x89', ' ', '\xE0', '\xB6', '\x9A', ' ', '\xE0', '\xB6', '\x9D', ' ', '\xE0', '\xB6', '\xB3', ' ', '\xE0', '\xB6', '\xB4', ' ', '\xE0', '\xB6', '\xBA', ' ', '\xE0', '\xB6', '\xBD', ' ', '\xE0', '\xB7', '\x86',  /* ඉ ක ඝ ඳ ප ය ල ෆ */
     '\0',
     '\xE0', '\xB6', '\x91', ' ', '\xE0', '\xB6', '\x94', ' ', '\xE0', '\xB6', '\x9D', ' ', '\xE0', '\xB6', '\xA2', ' ', '\xE0', '\xB6', '\xA7', ' ', '\xE0', '\xB6', '\xAE', ' ', '\xE0', '\xB6', '\xB0', ' ', '\xE0', '\xB6', '\xBB',  /* එ ඔ ඝ ජ ට ථ ධ ර */
@@ -601,6 +605,9 @@
     { AF_BLUE_STRING_OSAGE_SMALL_ASCENDER,    AF_BLUE_PROPERTY_LATIN_TOP       },
     { AF_BLUE_STRING_OSAGE_SMALL_DESCENDER,   0                                },
     { AF_BLUE_STRING_MAX,                     0                                },
+    { AF_BLUE_STRING_OSMANYA_TOP,    AF_BLUE_PROPERTY_LATIN_TOP },
+    { AF_BLUE_STRING_OSMANYA_BOTTOM, 0                          },
+    { AF_BLUE_STRING_MAX,            0                          },
     { AF_BLUE_STRING_SINHALA_TOP,       AF_BLUE_PROPERTY_LATIN_TOP },
     { AF_BLUE_STRING_SINHALA_BOTTOM,    0                          },
     { AF_BLUE_STRING_SINHALA_DESCENDER, 0                          },
diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat
index 03e2c98d7..9d21604eb 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -396,6 +396,11 @@ AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN:
   AF_BLUE_STRING_OSAGE_SMALL_DESCENDER
     "𐓤 𐓥 𐓦"
 
+  AF_BLUE_STRING_OSMANYA_TOP
+    "𐒆 𐒉 𐒐 𐒒 𐒘 𐒛 𐒠 𐒣"
+  AF_BLUE_STRING_OSMANYA_BOTTOM
+    "𐒀 𐒂 𐒆 𐒈 𐒊 𐒒 𐒠 𐒩"
+
   AF_BLUE_STRING_SINHALA_TOP
     "ඉ ක ඝ ඳ ප ය ල ෆ"
   AF_BLUE_STRING_SINHALA_BOTTOM
@@ -895,6 +900,11 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN:
     { AF_BLUE_STRING_OSAGE_SMALL_DESCENDER,   0                                }
     { AF_BLUE_STRING_MAX,                     0                                }
 
+  AF_BLUE_STRINGSET_OSMA
+    { AF_BLUE_STRING_OSMANYA_TOP,    AF_BLUE_PROPERTY_LATIN_TOP }
+    { AF_BLUE_STRING_OSMANYA_BOTTOM, 0                          }
+    { AF_BLUE_STRING_MAX,            0                          }
+
   AF_BLUE_STRINGSET_SINH
     { AF_BLUE_STRING_SINHALA_TOP,       AF_BLUE_PROPERTY_LATIN_TOP }
     { AF_BLUE_STRING_SINHALA_BOTTOM,    0                          }
diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h
index ceee5f0d6..8dea0a30c 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -214,27 +214,29 @@ FT_BEGIN_HEADER
     AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 3590,
     AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 3630,
     AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 3655,
-    AF_BLUE_STRING_SINHALA_TOP = 3670,
-    AF_BLUE_STRING_SINHALA_BOTTOM = 3702,
-    AF_BLUE_STRING_SINHALA_DESCENDER = 3734,
-    AF_BLUE_STRING_SUNDANESE_TOP = 3778,
-    AF_BLUE_STRING_SUNDANESE_BOTTOM = 3802,
-    AF_BLUE_STRING_SUNDANESE_DESCENDER = 3834,
-    AF_BLUE_STRING_TAI_VIET_TOP = 3842,
-    AF_BLUE_STRING_TAI_VIET_BOTTOM = 3862,
-    AF_BLUE_STRING_TAMIL_TOP = 3874,
-    AF_BLUE_STRING_TAMIL_BOTTOM = 3906,
-    AF_BLUE_STRING_TELUGU_TOP = 3938,
-    AF_BLUE_STRING_TELUGU_BOTTOM = 3966,
-    AF_BLUE_STRING_THAI_TOP = 3994,
-    AF_BLUE_STRING_THAI_BOTTOM = 4018,
-    AF_BLUE_STRING_THAI_ASCENDER = 4046,
-    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4058,
-    AF_BLUE_STRING_THAI_DESCENDER = 4070,
-    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4086,
-    AF_BLUE_STRING_THAI_DIGIT_TOP = 4094,
-    AF_BLUE_STRING_TIFINAGH = 4106,
-    af_blue_1_1 = 4137,
+    AF_BLUE_STRING_OSMANYA_TOP = 3670,
+    AF_BLUE_STRING_OSMANYA_BOTTOM = 3710,
+    AF_BLUE_STRING_SINHALA_TOP = 3750,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 3782,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 3814,
+    AF_BLUE_STRING_SUNDANESE_TOP = 3858,
+    AF_BLUE_STRING_SUNDANESE_BOTTOM = 3882,
+    AF_BLUE_STRING_SUNDANESE_DESCENDER = 3914,
+    AF_BLUE_STRING_TAI_VIET_TOP = 3922,
+    AF_BLUE_STRING_TAI_VIET_BOTTOM = 3942,
+    AF_BLUE_STRING_TAMIL_TOP = 3954,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 3986,
+    AF_BLUE_STRING_TELUGU_TOP = 4018,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 4046,
+    AF_BLUE_STRING_THAI_TOP = 4074,
+    AF_BLUE_STRING_THAI_BOTTOM = 4098,
+    AF_BLUE_STRING_THAI_ASCENDER = 4126,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4138,
+    AF_BLUE_STRING_THAI_DESCENDER = 4150,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4166,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 4174,
+    AF_BLUE_STRING_TIFINAGH = 4186,
+    af_blue_1_1 = 4217,
 #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,
@@ -330,14 +332,15 @@ FT_BEGIN_HEADER
     AF_BLUE_STRINGSET_OLCK = 170,
     AF_BLUE_STRINGSET_ORKH = 173,
     AF_BLUE_STRINGSET_OSGE = 176,
-    AF_BLUE_STRINGSET_SINH = 184,
-    AF_BLUE_STRINGSET_SUND = 188,
-    AF_BLUE_STRINGSET_TAML = 192,
-    AF_BLUE_STRINGSET_TAVT = 195,
-    AF_BLUE_STRINGSET_TELU = 198,
-    AF_BLUE_STRINGSET_THAI = 201,
-    AF_BLUE_STRINGSET_TFNG = 209,
-    af_blue_2_1 = 212,
+    AF_BLUE_STRINGSET_OSMA = 184,
+    AF_BLUE_STRINGSET_SINH = 187,
+    AF_BLUE_STRINGSET_SUND = 191,
+    AF_BLUE_STRINGSET_TAML = 195,
+    AF_BLUE_STRINGSET_TAVT = 198,
+    AF_BLUE_STRINGSET_TELU = 201,
+    AF_BLUE_STRINGSET_THAI = 204,
+    AF_BLUE_STRINGSET_TFNG = 212,
+    af_blue_2_1 = 215,
 #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 001d6288d..4c9deaa6d 100644
--- a/src/autofit/afranges.c
+++ b/src/autofit/afranges.c
@@ -690,6 +690,18 @@
   };
 
 
+  const AF_Script_UniRangeRec  af_osma_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0x10480, 0x104AF ),   /* Osmanya */
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+  const AF_Script_UniRangeRec  af_osma_nonbase_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0, 0 )
+  };
+
+
   const AF_Script_UniRangeRec  af_sinh_uniranges[] =
   {
     AF_UNIRANGE_REC(  0x0D80,  0x0DFF ),  /* Sinhala */
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index 941e6c877..5f778de94 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -107,7 +107,7 @@
           "Deseret",
           HB_SCRIPT_DESERET,
           HINTING_BOTTOM_TO_TOP,
-          "\xF0\x90\x90\x84 \xF0\x90\x90\xAC") /* 𐐄 𐐬 */
+          "\xF0\x90\x90\x84 \xF0\x90\x90\xAC" ) /* 𐐄 𐐬 */
 
   SCRIPT( ethi, ETHI,
           "Ethiopic",
@@ -137,7 +137,7 @@
           "Gothic",
           HB_SCRIPT_GOTHIC,
           HINTING_TOP_TO_BOTTOM,
-          "\xF0\x90\x8C\xB4 \xF0\x90\x8C\xBE \xF0\x90\x8D\x83") /* 𐌴 𐌾 𐍃 */
+          "\xF0\x90\x8C\xB4 \xF0\x90\x8C\xBE \xF0\x90\x8D\x83" ) /* 𐌴 𐌾 𐍃 */
 
   SCRIPT( grek, GREK,
           "Greek",
@@ -255,6 +255,12 @@
           HINTING_BOTTOM_TO_TOP,
           "\xF0\x90\x93\x82 \xF0\x90\x93\xAA" ) /* 𐓂 𐓪 */
 
+  SCRIPT( osma, OSMA,
+          "Osmanya",
+          HB_SCRIPT_OSMANYA,
+          HINTING_BOTTOM_TO_TOP,
+          "\xF0\x90\x92\x86 \xF0\x90\x92\xA0" ) /* 𐒆 𐒠 */
+
   SCRIPT( sinh, SINH,
           "Sinhala",
           HB_SCRIPT_SINHALA,
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index 7aeaa31ff..202add797 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -336,6 +336,13 @@
          AF_BLUE_STRINGSET_OSGE,
          AF_COVERAGE_DEFAULT )
 
+  STYLE( osma_dflt, OSMA_DFLT,
+         "Osmanya default style",
+         AF_WRITING_SYSTEM_LATIN,
+         AF_SCRIPT_OSMA,
+         AF_BLUE_STRINGSET_OSMA,
+         AF_COVERAGE_DEFAULT )
+
   STYLE( sinh_dflt, SINH_DFLT,
          "Sinhala default style",
          AF_WRITING_SYSTEM_LATIN,