diff --git a/ChangeLog b/ChangeLog
index 09774a2..90a0455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,18 @@
 2017-04-06  Sascha Brawer  <sascha@google.com>
 	    Werner Lemberg  <wl@gnu.org
 
+	[autofit] Add support for Osage script.
+
+	* src/autofit/afblue.dat: Add blue zone data for Osage.
+	* src/autofit/afblue.c, src/autofit/afblue.h: Regenerated.
+
+	* src/autofit/afscript.h: Add Osage standard characters.
+
+	* src/autofit/afranges.c, src/autofit/afstyles.h: Add Osage data.
+
+2017-04-06  Sascha Brawer  <sascha@google.com>
+	    Werner Lemberg  <wl@gnu.org
+
 	[autofit] Add support for Glagolitic script.
 
 	* src/autofit/afblue.dat: Add blue zone data for Glagolitic.
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index 3285523..edf2820 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -232,6 +232,20 @@
     '\0',
     '\xE1', '\xB1', '\x9B', ' ', '\xE1', '\xB1', '\x9C', ' ', '\xE1', '\xB1', '\x9D', ' ', '\xE1', '\xB1', '\xA1', ' ', '\xE1', '\xB1', '\xA2', ' ', '\xE1', '\xB1', '\xA5',  /* ᱛ ᱜ ᱝ ᱡ ᱢ ᱥ */
     '\0',
+    '\xF0', '\x90', '\x92', '\xBE', ' ', '\xF0', '\x90', '\x93', '\x8D', ' ', '\xF0', '\x90', '\x93', '\x92', ' ', '\xF0', '\x90', '\x93', '\x93', ' ', '\xF0', '\x90', '\x92', '\xBB', ' ', '\xF0', '\x90', '\x93', '\x82', ' ', '\xF0', '\x90', '\x92', '\xB5', ' ', '\xF0', '\x90', '\x93', '\x86',  /* 𐒾 𐓍 𐓒 𐓓 𐒻 𐓂 𐒵 𐓆 */
+    '\0',
+    '\xF0', '\x90', '\x92', '\xB0', ' ', '\xF0', '\x90', '\x93', '\x8D', ' ', '\xF0', '\x90', '\x93', '\x82', ' ', '\xF0', '\x90', '\x92', '\xBF', ' ', '\xF0', '\x90', '\x93', '\x8E', ' ', '\xF0', '\x90', '\x92', '\xB9',  /* 𐒰 𐓍 𐓂 𐒿 𐓎 𐒹 */
+    '\0',
+    '\xF0', '\x90', '\x92', '\xBC', ' ', '\xF0', '\x90', '\x92', '\xBD', ' ', '\xF0', '\x90', '\x92', '\xBE',  /* 𐒼 𐒽 𐒾 */
+    '\0',
+    '\xF0', '\x90', '\x93', '\xB5', ' ', '\xF0', '\x90', '\x93', '\xB6', ' ', '\xF0', '\x90', '\x93', '\xBA', ' ', '\xF0', '\x90', '\x93', '\xBB', ' ', '\xF0', '\x90', '\x93', '\x9D', ' ', '\xF0', '\x90', '\x93', '\xA3', ' ', '\xF0', '\x90', '\x93', '\xAA', ' ', '\xF0', '\x90', '\x93', '\xAE',  /* 𐓵 𐓶 𐓺 𐓻 𐓝 𐓣 𐓪 𐓮 */
+    '\0',
+    '\xF0', '\x90', '\x93', '\x98', ' ', '\xF0', '\x90', '\x93', '\x9A', ' ', '\xF0', '\x90', '\x93', '\xA3', ' ', '\xF0', '\x90', '\x93', '\xB5', ' ', '\xF0', '\x90', '\x93', '\xA1', ' ', '\xF0', '\x90', '\x93', '\xA7', ' ', '\xF0', '\x90', '\x93', '\xAA', ' ', '\xF0', '\x90', '\x93', '\xB6',  /* 𐓘 𐓚 𐓣 𐓵 𐓡 𐓧 𐓪 𐓶 */
+    '\0',
+    '\xF0', '\x90', '\x93', '\xA4', ' ', '\xF0', '\x90', '\x93', '\xA6', ' ', '\xF0', '\x90', '\x93', '\xB8', ' ', '\xF0', '\x90', '\x93', '\xB9', ' ', '\xF0', '\x90', '\x93', '\x9B',  /* 𐓤 𐓦 𐓸 𐓹 𐓛 */
+    '\0',
+    '\xF0', '\x90', '\x93', '\xA4', ' ', '\xF0', '\x90', '\x93', '\xA5', ' ', '\xF0', '\x90', '\x93', '\xA6',  /* 𐓤 𐓥 𐓦 */
+    '\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',  /* එ ඔ ඝ ජ ට ථ ධ ර */
@@ -478,6 +492,15 @@
     { AF_BLUE_STRING_OL_CHIKI, AF_BLUE_PROPERTY_LATIN_TOP },
     { AF_BLUE_STRING_OL_CHIKI, 0                          },
     { AF_BLUE_STRING_MAX,      0                          },
+    { AF_BLUE_STRING_OSAGE_CAPITAL_TOP,       AF_BLUE_PROPERTY_LATIN_TOP       },
+    { AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM,    0                                },
+    { AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER, 0                                },
+    { AF_BLUE_STRING_OSAGE_SMALL_TOP,         AF_BLUE_PROPERTY_LATIN_TOP     |
+                                              AF_BLUE_PROPERTY_LATIN_X_HEIGHT  },
+    { AF_BLUE_STRING_OSAGE_SMALL_BOTTOM,      0                                },
+    { 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_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 3f8cac6..be4b44b 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -318,6 +318,21 @@
   AF_BLUE_STRING_OL_CHIKI
     "ᱛ ᱜ ᱝ ᱡ ᱢ ᱥ"
 
+  AF_BLUE_STRING_OSAGE_CAPITAL_TOP
+    "𐒾 𐓍 𐓒 𐓓 𐒻 𐓂 𐒵 𐓆"
+  AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM
+    "𐒰 𐓍 𐓂 𐒿 𐓎 𐒹"
+  AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER
+    "𐒼 𐒽 𐒾"
+  AF_BLUE_STRING_OSAGE_SMALL_TOP
+    "𐓵 𐓶 𐓺 𐓻 𐓝 𐓣 𐓪 𐓮"
+  AF_BLUE_STRING_OSAGE_SMALL_BOTTOM
+    "𐓘 𐓚 𐓣 𐓵 𐓡 𐓧 𐓪 𐓶"
+  AF_BLUE_STRING_OSAGE_SMALL_ASCENDER
+    "𐓤 𐓦 𐓸 𐓹 𐓛"
+  AF_BLUE_STRING_OSAGE_SMALL_DESCENDER
+    "𐓤 𐓥 𐓦"
+
   AF_BLUE_STRING_SINHALA_TOP
     "ඉ ක ඝ ඳ ප ය ල ෆ"
   AF_BLUE_STRING_SINHALA_BOTTOM
@@ -741,6 +756,17 @@
     { AF_BLUE_STRING_OL_CHIKI, 0                          }
     { AF_BLUE_STRING_MAX,      0                          }
 
+  AF_BLUE_STRINGSET_OSGE
+    { AF_BLUE_STRING_OSAGE_CAPITAL_TOP,       AF_BLUE_PROPERTY_LATIN_TOP       }
+    { AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM,    0                                }
+    { AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER, 0                                }
+    { AF_BLUE_STRING_OSAGE_SMALL_TOP,         AF_BLUE_PROPERTY_LATIN_TOP     |
+                                              AF_BLUE_PROPERTY_LATIN_X_HEIGHT  }
+    { AF_BLUE_STRING_OSAGE_SMALL_BOTTOM,      0                                }
+    { 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_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 2cc109b..d1f1277 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -180,24 +180,31 @@
     AF_BLUE_STRING_NKO_SMALL_TOP = 2650,
     AF_BLUE_STRING_NKO_SMALL_BOTTOM = 2659,
     AF_BLUE_STRING_OL_CHIKI = 2671,
-    AF_BLUE_STRING_SINHALA_TOP = 2695,
-    AF_BLUE_STRING_SINHALA_BOTTOM = 2727,
-    AF_BLUE_STRING_SINHALA_DESCENDER = 2759,
-    AF_BLUE_STRING_TAI_VIET_TOP = 2803,
-    AF_BLUE_STRING_TAI_VIET_BOTTOM = 2823,
-    AF_BLUE_STRING_TAMIL_TOP = 2835,
-    AF_BLUE_STRING_TAMIL_BOTTOM = 2867,
-    AF_BLUE_STRING_TELUGU_TOP = 2899,
-    AF_BLUE_STRING_TELUGU_BOTTOM = 2927,
-    AF_BLUE_STRING_THAI_TOP = 2955,
-    AF_BLUE_STRING_THAI_BOTTOM = 2979,
-    AF_BLUE_STRING_THAI_ASCENDER = 3007,
-    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3019,
-    AF_BLUE_STRING_THAI_DESCENDER = 3031,
-    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3047,
-    AF_BLUE_STRING_THAI_DIGIT_TOP = 3055,
-    AF_BLUE_STRING_TIFINAGH = 3067,
-    af_blue_1_1 = 3098,
+    AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 2695,
+    AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 2735,
+    AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 2765,
+    AF_BLUE_STRING_OSAGE_SMALL_TOP = 2780,
+    AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 2820,
+    AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 2860,
+    AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 2885,
+    AF_BLUE_STRING_SINHALA_TOP = 2900,
+    AF_BLUE_STRING_SINHALA_BOTTOM = 2932,
+    AF_BLUE_STRING_SINHALA_DESCENDER = 2964,
+    AF_BLUE_STRING_TAI_VIET_TOP = 3008,
+    AF_BLUE_STRING_TAI_VIET_BOTTOM = 3028,
+    AF_BLUE_STRING_TAMIL_TOP = 3040,
+    AF_BLUE_STRING_TAMIL_BOTTOM = 3072,
+    AF_BLUE_STRING_TELUGU_TOP = 3104,
+    AF_BLUE_STRING_TELUGU_BOTTOM = 3132,
+    AF_BLUE_STRING_THAI_TOP = 3160,
+    AF_BLUE_STRING_THAI_BOTTOM = 3184,
+    AF_BLUE_STRING_THAI_ASCENDER = 3212,
+    AF_BLUE_STRING_THAI_LARGE_ASCENDER = 3224,
+    AF_BLUE_STRING_THAI_DESCENDER = 3236,
+    AF_BLUE_STRING_THAI_LARGE_DESCENDER = 3252,
+    AF_BLUE_STRING_THAI_DIGIT_TOP = 3260,
+    AF_BLUE_STRING_TIFINAGH = 3272,
+    af_blue_1_1 = 3303,
 #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,
@@ -283,13 +290,14 @@
     AF_BLUE_STRINGSET_NKOO = 130,
     AF_BLUE_STRINGSET_NONE = 135,
     AF_BLUE_STRINGSET_OLCK = 136,
-    AF_BLUE_STRINGSET_SINH = 139,
-    AF_BLUE_STRINGSET_TAML = 143,
-    AF_BLUE_STRINGSET_TAVT = 146,
-    AF_BLUE_STRINGSET_TELU = 149,
-    AF_BLUE_STRINGSET_THAI = 152,
-    AF_BLUE_STRINGSET_TFNG = 160,
-    af_blue_2_1 = 163,
+    AF_BLUE_STRINGSET_OSGE = 139,
+    AF_BLUE_STRINGSET_SINH = 147,
+    AF_BLUE_STRINGSET_TAML = 151,
+    AF_BLUE_STRINGSET_TAVT = 154,
+    AF_BLUE_STRINGSET_TELU = 157,
+    AF_BLUE_STRINGSET_THAI = 160,
+    AF_BLUE_STRINGSET_TFNG = 168,
+    af_blue_2_1 = 171,
 #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 2e743de..63effe8 100644
--- a/src/autofit/afranges.c
+++ b/src/autofit/afranges.c
@@ -566,6 +566,18 @@
   };
 
 
+  const AF_Script_UniRangeRec  af_osge_uniranges[] =
+  {
+    AF_UNIRANGE_REC( 0x104B0, 0x104FF ),    /* Osage */
+    AF_UNIRANGE_REC(       0,       0 )
+  };
+
+  const AF_Script_UniRangeRec  af_osge_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 18834c1..a53b675 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -195,6 +195,12 @@
           HINTING_BOTTOM_TO_TOP,
           "\xE1\xB1\x9B" ) /* ᱛ */
 
+  SCRIPT( osge, OSGE,
+          "Osage",
+          HB_SCRIPT_OSAGE,
+          HINTING_BOTTOM_TO_TOP,
+          "\xF0\x90\x93\x82 \xF0\x90\x93\xAA" ) /* 𐓂 𐓪 */
+
   SCRIPT( sinh, SINH,
           "Sinhala",
           HB_SCRIPT_SINHALA,
diff --git a/src/autofit/afstyles.h b/src/autofit/afstyles.h
index 8fa82d5..3c2dbd0 100644
--- a/src/autofit/afstyles.h
+++ b/src/autofit/afstyles.h
@@ -266,6 +266,13 @@
          AF_BLUE_STRINGSET_OLCK,
          AF_COVERAGE_DEFAULT )
 
+  STYLE( osge_dflt, OSGE_DFLT,
+         "Osage default style",
+         AF_WRITING_SYSTEM_LATIN,
+         AF_SCRIPT_OSGE,
+         AF_BLUE_STRINGSET_OSGE,
+         AF_COVERAGE_DEFAULT )
+
   STYLE( sinh_dflt, SINH_DFLT,
          "Sinhala default style",
          AF_WRITING_SYSTEM_LATIN,