diff --git a/stepmania/Themes/default/Fonts/_japanese 16px [extra] 4x1.png b/stepmania/Themes/default/Fonts/_japanese 16px [extra] 4x1.png
new file mode 100644
index 0000000000..89c5c56bd5
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_japanese 16px [extra] 4x1.png differ
diff --git a/stepmania/Themes/default/Fonts/_japanese 16px [kanji 4] 8x8.png b/stepmania/Themes/default/Fonts/_japanese 16px [kanji 4] 8x8.png
index c617ff7f8b..a19ca66dee 100644
Binary files a/stepmania/Themes/default/Fonts/_japanese 16px [kanji 4] 8x8.png and b/stepmania/Themes/default/Fonts/_japanese 16px [kanji 4] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_japanese 16px.ini b/stepmania/Themes/default/Fonts/_japanese 16px.ini
index 9eeb9531f8..dcab569ccd 100644
--- a/stepmania/Themes/default/Fonts/_japanese 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_japanese 16px.ini	
@@ -15,6 +15,14 @@ DefaultWidth=20
 # This page maps to basic-japanese (Unicode U+3000 to U+30FF.)
 range basic-japanese=0
 
+[extra]
+# This page is a special case: characters that aren't automatically-generated.
+# 郑 is Chinese, and isn't in MS gothic, so we use MingLiU instead.  Put the whole
+# name in this font, or it'll look wrong.  If we need these characters for a Japanese
+# name, it'll be tricky.  The real solution is to tag text by language, so we can have
+# eg. separate 文 characters for Japanese and Chinese.
+line 0=郑秀文
+
 # Smaller center dot.
 251=10
 
@@ -54,5 +62,5 @@ line 1=男眠胎自魂女宏和
 line 2=魅惑音頭踊貸与園
 line 3=黙藁面鳥近浩治入
 line 4=尾信充乙陽記念歌
-line 5=奇侠秀文記念沢氷
-line 6=恭王菲
+line 5=奇侠記念沢氷恭王
+line 6=菲
diff --git a/stepmania/Themes/default/Fonts/_japanese 24px [extra] 4x1.png b/stepmania/Themes/default/Fonts/_japanese 24px [extra] 4x1.png
new file mode 100644
index 0000000000..97fe3f5626
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_japanese 24px [extra] 4x1.png differ
diff --git a/stepmania/Themes/default/Fonts/_japanese 24px [kanji 4] 8x8.png b/stepmania/Themes/default/Fonts/_japanese 24px [kanji 4] 8x8.png
index 735f88c603..dad3573c01 100644
Binary files a/stepmania/Themes/default/Fonts/_japanese 24px [kanji 4] 8x8.png and b/stepmania/Themes/default/Fonts/_japanese 24px [kanji 4] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_japanese 24px.ini b/stepmania/Themes/default/Fonts/_japanese 24px.ini
index 3ee8236eb9..7bf67432a1 100644
--- a/stepmania/Themes/default/Fonts/_japanese 24px.ini	
+++ b/stepmania/Themes/default/Fonts/_japanese 24px.ini	
@@ -18,6 +18,9 @@ range basic-japanese=0
 # Smaller center dot.
 251=14
 
+[extra]
+line 0=郑秀文
+
 [kanji 1]
 line 0=一二三四五六七八
 line 1=九十本語＆（）？
@@ -54,5 +57,5 @@ line 1=男眠胎自魂女宏和
 line 2=魅惑音頭踊貸与園
 line 3=黙藁面鳥近浩治入
 line 4=尾信充乙陽記念歌
-line 5=奇侠秀文記念沢氷
-line 6=恭王菲
+line 5=奇侠記念沢氷恭王
+line 6=菲