diff --git a/src/hb-icu.c b/src/hb-icu.c
index 97b2fa07f7a7a0bb169af0246c72283dfe470842..44709b19270327ad6f682dfbddfe770697f8ac4b 100644
--- a/src/hb-icu.c
+++ b/src/hb-icu.c
@@ -228,6 +228,12 @@ hb_icu_get_script (hb_codepoint_t unicode)
   MATCH_SCRIPT2(ORKHON, OLD_TURKIC);     /* Orkh */
   MATCH_SCRIPT (SAMARITAN);              /* Samr */
   MATCH_SCRIPT (TAI_VIET);               /* Tavt */
+
+  /* Unicode-6.0 additions */
+  MATCH_SCRIPT (BATAK);                  /* Batk */
+  MATCH_SCRIPT (BRAHMI);                 /* Brah */
+  MATCH_SCRIPT2(MANDAEAN, MANDAIC);      /* Mand */
+
   }
   return HB_SCRIPT_UNKNOWN;
 }
diff --git a/src/hb-ot-tag.c b/src/hb-ot-tag.c
index d774c4fd37e99c41861be93d0c9c2b88112f35e5..8c23ce94ed6dbcf4f8c73ab35d5f9f3c5914c61d 100644
--- a/src/hb-ot-tag.c
+++ b/src/hb-ot-tag.c
@@ -139,7 +139,12 @@ static const hb_tag_t ot_scripts[][3] = {
   {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_OLD_TURKIC */
   {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_SAMARITAN */
   {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_TAI_THAM */
-  {HB_TAG('D','F','L','T')} 	/* HB_SCRIPT_TAI_VIET */
+  {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_TAI_VIET */
+
+  /* Unicode-6.0 additions */
+  {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_BATAK */
+  {HB_TAG('D','F','L','T')},	/* HB_SCRIPT_BRAHMI */
+  {HB_TAG('D','F','L','T')} 	/* HB_SCRIPT_MANDAIC */
 };
 
 const hb_tag_t *
diff --git a/src/hb-unicode.c b/src/hb-unicode.c
index 280c61f9e1673d5fe06fcdc0679d769e64fe50cd..2ab308b69004ac8a12518c94cdcbf79f6c77fb50 100644
--- a/src/hb-unicode.c
+++ b/src/hb-unicode.c
@@ -341,7 +341,12 @@ const hb_direction_t horiz_dir[] =
   RTL,	/* Orkh */
   RTL,	/* Samr */
   LTR,	/* Lana */
-  LTR 	/* Tavt */
+  LTR,	/* Tavt */
+
+  /* Unicode-6.0 additions */
+  LTR,	/* Batk */
+  LTR,	/* Brah */
+  RTL 	/* Mand */
 };
 #undef LTR
 #undef RTL
diff --git a/src/hb-unicode.h b/src/hb-unicode.h
index 9fedd27467843f2b830d7c6c2216943816fe2044..5fd6dffc53255600da4246240321bff3e66c9511 100644
--- a/src/hb-unicode.h
+++ b/src/hb-unicode.h
@@ -173,7 +173,12 @@ typedef enum
   HB_SCRIPT_OLD_TURKIC,             /* Orkh */
   HB_SCRIPT_SAMARITAN,              /* Samr */
   HB_SCRIPT_TAI_THAM,               /* Lana */
-  HB_SCRIPT_TAI_VIET                /* Tavt */
+  HB_SCRIPT_TAI_VIET,               /* Tavt */
+
+  /* Unicode-6.0 additions */
+  HB_SCRIPT_BATAK,                  /* Batk */
+  HB_SCRIPT_BRAHMI,                 /* Brah */
+  HB_SCRIPT_MANDAIC                 /* Mand */
 } hb_script_t;