diff --git a/Makefile.in b/Makefile.in
index 8c874607..d0fbe589 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -741,6 +741,7 @@ noto_sans_arabic.ttf = $(FONTS)/noto/NotoSansArabic-Regular.ttf
 noto_sans_armenian.ttf = $(FONTS)/noto/NotoSansArmenian-Regular.ttf
 noto_sans_bengali.ttf = $(FONTS)/noto/NotoSansBengali-Regular.ttf
 noto_sans_bengaliui.ttf = $(FONTS)/noto/NotoSansBengaliUI-Regular.ttf
+noto_sans_chakma.ttf = $(FONTS)/noto/NotoSansChakma-Regular.ttf
 noto_sans_coptic.ttf = $(FONTS)/noto/NotoSansCoptic-Regular.ttf
 noto_sans_devanagariui.ttf = $(FONTS)/noto/NotoSansDevanagariUI-Regular.ttf
 noto_sans_georgian.ttf = $(FONTS)/noto/NotoSansGeorgian-Regular.ttf
@@ -765,6 +766,8 @@ noto_sans_tamilui.ttf = $(FONTS)/noto/NotoSansTamilUI-Regular.ttf
 noto_sans_teluguui.ttf = $(FONTS)/noto/NotoSansTeluguUI-Regular.ttf
 noto_sans_thaana.ttf = $(FONTS)/noto/NotoSansThaana-Regular.ttf
 noto_sans_thai.ttf = $(FONTS)/noto/NotoSansThai-Regular.ttf
+# Unfortunately Tibetan only exists as Serif
+noto_serif_tibetan.ttf = $(FONTS)/noto/NotoSerifTibetan-Regular.ttf
 
 micross.ttf = $(FONTS_OBJ)/micross.ttf
 nirmala.ttf = $(FONTS_OBJ)/nirmala.ttf
@@ -840,13 +843,14 @@ $(micross.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_arabic.tt
 		$(noto_sans_tamil.ttf) $(noto_sans_thaana.ttf) $(noto_sans_thai.ttf) $(noto_sans_math.ttf) $(noto_sans_symbols.ttf) $(noto_sans_mono.ttf) \
 		"MicrosoftSansSerif" "Microsoft Sans Serif" "Regular" $(FONTS)/ranges/micross $(micross.ttf)
 
-$(nirmala.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_bengaliui.ttf) $(noto_sans_devanagariui.ttf) $(noto_sans_gujaratiui.ttf) $(noto_sans_gurmukhiui.ttf) \
+$(nirmala.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_chakma.ttf) $(noto_sans_bengaliui.ttf) $(noto_sans_devanagariui.ttf) $(noto_sans_gujaratiui.ttf) $(noto_sans_gurmukhiui.ttf) \
 		$(noto_sans_kannadaui.ttf) $(noto_sans_malayalamui.ttf) $(noto_sans_meeteimayek.ttf) $(noto_sans_olchiki.ttf) $(noto_sans_oriyaui.ttf) \
-		$(noto_sans_sinhalaui.ttf) $(noto_sans_sorasompeng.ttf) $(noto_sans_tamilui.ttf) $(noto_sans_teluguui.ttf)
-	$(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_bengaliui.ttf) $(noto_sans_devanagariui.ttf) $(noto_sans_gujaratiui.ttf) \
+		$(noto_sans_sinhalaui.ttf) $(noto_sans_sorasompeng.ttf) $(noto_sans_tamilui.ttf) $(noto_sans_teluguui.ttf) $(noto_serif_tibetan.ttf) $(noto_sans_math.ttf) \
+		$(noto_sans_symbols2.ttf)
+	$(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_chakma.ttf) $(noto_sans_bengaliui.ttf) $(noto_sans_devanagariui.ttf) $(noto_sans_gujaratiui.ttf) \
 		$(noto_sans_gurmukhiui.ttf) $(noto_sans_kannadaui.ttf) $(noto_sans_malayalamui.ttf) $(noto_sans_meeteimayek.ttf) $(noto_sans_olchiki.ttf) \
 		$(noto_sans_oriyaui.ttf) $(noto_sans_sinhalaui.ttf) $(noto_sans_sorasompeng.ttf) $(noto_sans_tamilui.ttf) $(noto_sans_teluguui.ttf) \
-		"NirmalaUI" "Nirmala UI" "Regular" /dev/null $(nirmala.ttf)
+		$(noto_serif_tibetan.ttf) $(noto_sans_math.ttf) $(noto_sans_symbols2.ttf) "NirmalaUI" "Nirmala UI" "Regular" $(FONTS)/ranges/nirmala $(nirmala.ttf)
 
 $(alt_arial.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_armenian.ttf) $(noto_sans_coptic.ttf) \
 		$(noto_sans_math.ttf) $(noto_sans_symbols.ttf) $(noto_sans_symbols2.ttf) $(noto_sans_mono.ttf) | $(ALT_FONTS_OBJ)
diff --git a/fonts/noto/NotoSansChakma-Regular.ttf b/fonts/noto/NotoSansChakma-Regular.ttf
new file mode 100644
index 00000000..21de4643
Binary files /dev/null and b/fonts/noto/NotoSansChakma-Regular.ttf differ
diff --git a/fonts/noto/NotoSerifTibetan-Regular.ttf b/fonts/noto/NotoSerifTibetan-Regular.ttf
new file mode 100644
index 00000000..3c3e0198
Binary files /dev/null and b/fonts/noto/NotoSerifTibetan-Regular.ttf differ
diff --git a/fonts/ranges/nirmala b/fonts/ranges/nirmala
new file mode 100644
index 00000000..30f09844
--- /dev/null
+++ b/fonts/ranges/nirmala
@@ -0,0 +1,166 @@
+000D
+0020-007E
+00A0-00FF
+0131
+0152-0153
+0160-0161
+0178
+017D-017E
+0192
+02BC
+02C6-02C7
+02D8
+02DA
+02DC
+03BC
+0900-0983
+0985-098C
+098F-0990
+0993-09A8
+09AA-09B0
+09B2
+09B6-09B9
+09BC-09C4
+09C7-09C8
+09CB-09CE
+09D7
+09DC-09DD
+09DF-09E3
+09E6-09FE
+0A01-0A03
+0A05-0A0A
+0A0F-0A10
+0A13-0A28
+0A2A-0A30
+0A32-0A33
+0A35-0A36
+0A38-0A39
+0A3C
+0A3E-0A42
+0A47-0A48
+0A4B-0A4D
+0A51
+0A59-0A5C
+0A5E
+0A66-0A76
+0A81-0A83
+0A85-0A8D
+0A8F-0A91
+0A93-0AA8
+0AAA-0AB0
+0AB2-0AB3
+0AB5-0AB9
+0ABC-0AC5
+0AC7-0AC9
+0ACB-0ACD
+0AD0
+0AE0-0AE3
+0AE6-0AF1
+0AF9-0AFF
+0B01-0B03
+0B05-0B0C
+0B0F-0B10
+0B13-0B28
+0B2A-0B30
+0B32-0B33
+0B35-0B39
+0B3C-0B44
+0B47-0B48
+0B4B-0B4D
+0B56-0B57
+0B5C-0B5D
+0B5F-0B63
+0B66-0B77
+0B82-0B83
+0B85-0B8A
+0B8E-0B90
+0B92-0B95
+0B99-0B9A
+0B9C
+0B9E-0B9F
+0BA3-0BA4
+0BA8-0BAA
+0BAE-0BB9
+0BBE-0BC2
+0BC6-0BC8
+0BCA-0BCD
+0BD0
+0BD7
+0BE6-0BFA
+0C00-0C0C
+0C0E-0C10
+0C12-0C28
+0C2A-0C39
+0C3D-0C44
+0C46-0C48
+0C4A-0C4D
+0C55-0C56
+0C58-0C5A
+0C60-0C63
+0C66-0C6F
+0C78-0C8C
+0C8E-0C90
+0C92-0CA8
+0CAA-0CB3
+0CB5-0CB9
+0CBC-0CC4
+0CC6-0CC8
+0CCA-0CCD
+0CD5-0CD6
+0CDE
+0CE0-0CE3
+0CE6-0CEF
+0CF1-0CF2
+0D00-0D03
+0D05-0D0C
+0D0E-0D10
+0D12-0D44
+0D46-0D48
+0D4A-0D4F
+0D54-0D63
+0D66-0D7F
+0D82-0D83
+0D85-0D96
+0D9A-0DB1
+0DB3-0DBB
+0DBD
+0DC0-0DC6
+0DCA
+0DCF-0DD4
+0DD6
+0DD8-0DDF
+0DE6-0DEF
+0DF2-0DF4
+0FD5-0FD8
+1C50-1C7F
+1CD0-1CF9
+200B-200D
+2010
+2013-2014
+2018-201A
+201C-201E
+2020-2022
+2026
+2030
+2039-203A
+2044
+20A8
+20AC
+20B9
+2122
+2212
+2215
+2219
+2236
+25CC
+25CF
+262C
+A830-A839
+A8E0-A8FF
+ABC0-ABED
+ABF0-ABF9
+110D0-110E8
+110F0-110F9
+11100-11134
+11136-11146
+111E1-111F4