diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
index 46de0d41e..857579d4f 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
+++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
@@ -10,7 +10,7 @@
Emulation
-
+
diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf
index 6f759b251..d89605b60 100644
--- a/contrib/windows/installer/dosbox-x.reference.setup.conf
+++ b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -620,6 +620,10 @@ monochrome_pal = green
# pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation.
# Will only work with apps and games using BIOS for keyboard.
# Possible values: true, false, 1, 0, auto.
+# pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation.
+# pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation.
+# By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM.
+# If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option).
#DOSBOX-X-ADV:# pc-98 show graphics layer on initialize: If PC-98 mode and INT 33h emulation is enabled, the graphics layer will be automatically enabled
#DOSBOX-X-ADV:# at driver startup AND when INT 33h AX=0 is called. This is NEC MOUSE.COM behavior and default
#DOSBOX-X-ADV:# enabled. To emulate other drivers like QMOUSE that do not follow this behavior, set to false.
@@ -650,6 +654,8 @@ pc-98 bus mouse = true
#DOSBOX-X-ADV:pc-98 timer master frequency = 0
#DOSBOX-X-ADV:pc-98 allow 4 display partition graphics = -1
pc-98 force ibm keyboard layout = auto
+pc-98 try font rom = true
+pc-98 anex86 font =
#DOSBOX-X-ADV:pc-98 show graphics layer on initialize = true
[dosv]
diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
index 9e5adb678..b84c54bab 100644
--- a/dosbox-x.reference.conf
+++ b/dosbox-x.reference.conf
@@ -278,6 +278,10 @@ monochrome_pal = green
# pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation.
# Will only work with apps and games using BIOS for keyboard.
# Possible values: true, false, 1, 0, auto.
+# pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation.
+# pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation.
+# By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM.
+# If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option).
#
# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
# -> pc-98 int 1b fdc timer wait; pc-98 pic init to read isr; pc-98 fm board irq; pc-98 fm board io port; pc-98 sound bios; pc-98 load sound bios rom file; pc-98 buffer page flip; pc-98 enable 256-color planar; pc-98 enable 188 user cg; pc-98 start gdc at 5mhz; pc-98 allow scanline effect; pc-98 video mode; pc-98 timer always cycles; pc-98 timer master frequency; pc-98 allow 4 display partition graphics; pc-98 show graphics layer on initialize
@@ -290,6 +294,8 @@ pc-98 enable grcg = true
pc-98 enable egc = true
pc-98 bus mouse = true
pc-98 force ibm keyboard layout = auto
+pc-98 try font rom = true
+pc-98 anex86 font =
[dosv]
# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for
diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
index 059324220..4f5c0d68c 100644
--- a/dosbox-x.reference.full.conf
+++ b/dosbox-x.reference.full.conf
@@ -604,6 +604,10 @@ monochrome_pal = green
# pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation.
# Will only work with apps and games using BIOS for keyboard.
# Possible values: true, false, 1, 0, auto.
+# pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation.
+# pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation.
+# By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM.
+# If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option).
# pc-98 show graphics layer on initialize: If PC-98 mode and INT 33h emulation is enabled, the graphics layer will be automatically enabled
# at driver startup AND when INT 33h AX=0 is called. This is NEC MOUSE.COM behavior and default
# enabled. To emulate other drivers like QMOUSE that do not follow this behavior, set to false.
@@ -630,6 +634,8 @@ pc-98 timer always cycles = auto
pc-98 timer master frequency = 0
pc-98 allow 4 display partition graphics = -1
pc-98 force ibm keyboard layout = auto
+pc-98 try font rom = true
+pc-98 anex86 font =
pc-98 show graphics layer on initialize = true
[dosv]
diff --git a/include/build_timestamp.h b/include/build_timestamp.h
index d184bcb3e..cc9b8bc46 100644
--- a/include/build_timestamp.h
+++ b/include/build_timestamp.h
@@ -1,4 +1,4 @@
/*auto-generated*/
-#define UPDATED_STR "Jul 4, 2021 4:14:46am"
-#define GIT_COMMIT_HASH "8c198fa"
+#define UPDATED_STR "Jul 12, 2021 4:20:58am"
+#define GIT_COMMIT_HASH "045afcf"
#define COPYRIGHT_END_YEAR "2021"