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 857579d4f..027b687f0 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 a3882fc95..96dbef9e3 100644
--- a/contrib/windows/installer/dosbox-x.reference.setup.conf
+++ b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -1097,7 +1097,9 @@ auxdevice = intellimouse
# font: Specifies a TrueType font to use for the TTF output. If not specified, the built-in TrueType font will be used.
# Either a font name or full font path can be specified. If file ends with the .TTF extension then the extension can be omitted.
# For a font name or relative path, directories such as the working directory and default system font directory will be searched.
-# For example, setting it to "consola" or "consola.ttf" will use the Consola font; similar for other TTF fonts.
+# For example, setting it to "consola" or "consola.ttf" will use Consola font (included in Windows); similar for other TTF fonts.
+# Additionally, OTF fonts (e.g. OratorStd.otf), .FON fonts (e.g. vgasys.fon), and .TTC fonts (e.g. msgothic.ttc) are also supported.
+# To display Chinese/Japanese/Korean text in these code pages, a font with CJK characters is needed (e.g. GNU Unifont or Sarasa Gothic).
# fontbold: You can optionally specify a bold TrueType font for use with the TTF output that will render the bold text style.
# It requires a word processor be set with the wp option, and this actual bold font will be used for the bold style.
# For example, setting it to "consolab" or "consolab.ttf" will use the Consolab font; similar for other TTF fonts.
diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
index f0cc75628..93e1e4334 100644
--- a/dosbox-x.reference.conf
+++ b/dosbox-x.reference.conf
@@ -421,7 +421,9 @@ auxdevice = intellimouse
# font: Specifies a TrueType font to use for the TTF output. If not specified, the built-in TrueType font will be used.
# Either a font name or full font path can be specified. If file ends with the .TTF extension then the extension can be omitted.
# For a font name or relative path, directories such as the working directory and default system font directory will be searched.
-# For example, setting it to "consola" or "consola.ttf" will use the Consola font; similar for other TTF fonts.
+# For example, setting it to "consola" or "consola.ttf" will use Consola font (included in Windows); similar for other TTF fonts.
+# Additionally, OTF fonts (e.g. OratorStd.otf), .FON fonts (e.g. vgasys.fon), and .TTC fonts (e.g. msgothic.ttc) are also supported.
+# To display Chinese/Japanese/Korean text in these code pages, a font with CJK characters is needed (e.g. GNU Unifont or Sarasa Gothic).
# fontbold: You can optionally specify a bold TrueType font for use with the TTF output that will render the bold text style.
# It requires a word processor be set with the wp option, and this actual bold font will be used for the bold style.
# For example, setting it to "consolab" or "consolab.ttf" will use the Consolab font; similar for other TTF fonts.
diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
index a2521f73d..3fe84930a 100644
--- a/dosbox-x.reference.full.conf
+++ b/dosbox-x.reference.full.conf
@@ -1065,7 +1065,9 @@ auxdevice = intellimouse
# font: Specifies a TrueType font to use for the TTF output. If not specified, the built-in TrueType font will be used.
# Either a font name or full font path can be specified. If file ends with the .TTF extension then the extension can be omitted.
# For a font name or relative path, directories such as the working directory and default system font directory will be searched.
-# For example, setting it to "consola" or "consola.ttf" will use the Consola font; similar for other TTF fonts.
+# For example, setting it to "consola" or "consola.ttf" will use Consola font (included in Windows); similar for other TTF fonts.
+# Additionally, OTF fonts (e.g. OratorStd.otf), .FON fonts (e.g. vgasys.fon), and .TTC fonts (e.g. msgothic.ttc) are also supported.
+# To display Chinese/Japanese/Korean text in these code pages, a font with CJK characters is needed (e.g. GNU Unifont or Sarasa Gothic).
# fontbold: You can optionally specify a bold TrueType font for use with the TTF output that will render the bold text style.
# It requires a word processor be set with the wp option, and this actual bold font will be used for the bold style.
# For example, setting it to "consolab" or "consolab.ttf" will use the Consolab font; similar for other TTF fonts.
diff --git a/include/build_timestamp.h b/include/build_timestamp.h
index cc9b8bc46..b119d2c4f 100644
--- a/include/build_timestamp.h
+++ b/include/build_timestamp.h
@@ -1,4 +1,4 @@
/*auto-generated*/
-#define UPDATED_STR "Jul 12, 2021 4:20:58am"
-#define GIT_COMMIT_HASH "045afcf"
+#define UPDATED_STR "Jul 16, 2021 1:02:01am"
+#define GIT_COMMIT_HASH "30adfdf"
#define COPYRIGHT_END_YEAR "2021"
diff --git a/src/dosbox.cpp b/src/dosbox.cpp
index 90c6dea17..4093a2255 100644
--- a/src/dosbox.cpp
+++ b/src/dosbox.cpp
@@ -2617,7 +2617,9 @@ void DOSBOX_SetupConfigSections(void) {
Pstring->Set_help("Specifies a TrueType font to use for the TTF output. If not specified, the built-in TrueType font will be used.\n"
"Either a font name or full font path can be specified. If file ends with the .TTF extension then the extension can be omitted.\n"
"For a font name or relative path, directories such as the working directory and default system font directory will be searched.\n"
- "For example, setting it to \"consola\" or \"consola.ttf\" will use the Consola font; similar for other TTF fonts.");
+ "For example, setting it to \"consola\" or \"consola.ttf\" will use Consola font (included in Windows); similar for other TTF fonts.\n"
+ "Additionally, OTF fonts (e.g. OratorStd.otf), .FON fonts (e.g. vgasys.fon), and .TTC fonts (e.g. msgothic.ttc) are also supported.\n"
+ "To display Chinese/Japanese/Korean text in these code pages, a font with CJK characters is needed (e.g. GNU Unifont or Sarasa Gothic).");
Pstring->SetBasic(true);
Pstring = secprop->Add_string("fontbold", Property::Changeable::Always, "");