diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index bd6c765a6..d6520188c 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -254,6 +254,10 @@ set_indic_properties (hb_glyph_info_t &info)
     if (_hb_glyph_info_get_general_category (&info) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
       cat = OT_N;
   }
+  /* Decimal and Brahmi numbers. */
+  else if (unlikely (_hb_glyph_info_get_general_category (&info) ==
+		     HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER ||
+		     hb_in_range<hb_codepoint_t> (u, 0x11052, 0x11065))) cat = OT_PLACEHOLDER;
 
 
 
diff --git a/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt b/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt
index abf97602d..4a8326c23 100644
--- a/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt
+++ b/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt
@@ -32,3 +32,5 @@
 क‌ि
 ऽं
 रुँः
+1ि
+१॑