diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png
index 5a1f67c96c..1b854f216f 100644
Binary files a/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png
new file mode 100644
index 0000000000..732e2f1b91
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 16px.ini b/stepmania/Themes/default/Fonts/_korean 16px.ini
index b9438fb667..e93a38cfc0 100644
--- a/stepmania/Themes/default/Fonts/_korean 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 16px.ini	
@@ -9,9 +9,22 @@ Baseline=23
 LineSpacing=20
 DefaultWidth=20
 
-line 0=경고굴기길나놀는
-line 1=단도랑래레련를리
-line 2=머바박배뱩뱻벗사
-line 3=스승써야어옝위유
-line 4=윤이자잦잭준지직
-line 5=초캉커팍혁혠화
+line 0=경고교굴기길나넛
+line 1=놀누는니단도듀라
+line 2=랑래랩레련로론루
+line 3=를리막매맨머몽밀
+line 4=바박배뱃뱩뱻벗브
+line 5=삐사샤서션스승신
+line 6=써쓰애야어에영옝
+line 7=와요워위유윤이잉
+
+[jamo 2]
+Top=8
+Baseline=23
+LineSpacing=20
+DefaultWidth=20
+
+line 0=자잦잭젠준지직찾
+line 1=책초치캉커쿨크클
+line 2=키타틴파팍패플피
+line 3=하허혁현혠화
diff --git a/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png b/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png
index 471a4a6ba7..1ac57b0efd 100644
Binary files a/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png and b/stepmania/Themes/default/Fonts/_korean 24px [jamo 1] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 24px [jamo 2] 8x8.png b/stepmania/Themes/default/Fonts/_korean 24px [jamo 2] 8x8.png
new file mode 100644
index 0000000000..8041e92659
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 24px [jamo 2] 8x8.png differ
diff --git a/stepmania/Themes/default/Fonts/_korean 24px.ini b/stepmania/Themes/default/Fonts/_korean 24px.ini
index 4194492268..6b42d83791 100644
--- a/stepmania/Themes/default/Fonts/_korean 24px.ini	
+++ b/stepmania/Themes/default/Fonts/_korean 24px.ini	
@@ -9,9 +9,22 @@ Baseline=26
 LineSpacing=28
 DefaultWidth=28
 
-line 0=경고굴기길나놀는
-line 1=단도랑래레련를리
-line 2=머바박배뱩뱻벗사
-line 3=스승써야어옝위유
-line 4=윤이자잦잭준지직
-line 5=초캉커팍혁혠화
+line 0=경고교굴기길나넛
+line 1=놀누는니단도듀라
+line 2=랑래랩레련로론루
+line 3=를리막매맨머몽밀
+line 4=바박배뱃뱩뱻벗브
+line 5=삐사샤서션스승신
+line 6=써쓰애야어에영옝
+line 7=와요워위유윤이잉
+
+[jamo 2]
+Top=5
+Baseline=26
+LineSpacing=28
+DefaultWidth=28
+
+line 0=자잦잭젠준지직찾
+line 1=책초치캉커쿨크클
+line 2=키타틴파팍패플피
+line 3=하허혁현혠화
diff --git a/stepmania/Utils/Font generation/Templates/jamo 1 template.psd b/stepmania/Utils/Font generation/Templates/jamo 1 template.psd
index 7ec6532b7a..8ba1813b3c 100644
Binary files a/stepmania/Utils/Font generation/Templates/jamo 1 template.psd and b/stepmania/Utils/Font generation/Templates/jamo 1 template.psd differ
diff --git a/stepmania/Utils/Font generation/Templates/jamo 2 template.psd b/stepmania/Utils/Font generation/Templates/jamo 2 template.psd
new file mode 100644
index 0000000000..cc495154bd
Binary files /dev/null and b/stepmania/Utils/Font generation/Templates/jamo 2 template.psd differ
diff --git a/stepmania/Utils/Font generation/Text.js b/stepmania/Utils/Font generation/Text.js
index 6fba6540d0..54d922ab08 100644
--- a/stepmania/Utils/Font generation/Text.js	
+++ b/stepmania/Utils/Font generation/Text.js	
@@ -31,14 +31,14 @@ var OutputDir = "c:/temp/stepmania/utils/Font generation/Output/";
  * a single text layer with the characters we want.  The orientation, font, etc.
  * don't matter; they'll be overridden. */
 var JAFontPages = Array("main", "kanji 1", "kanji 2","kanji 3");
-var KRFontPages = Array("jamo 1");
+var KRFontPages = Array("jamo 1", "jamo 2");
 
 var Fonts = new Array(
 	/* name                       font         pages        frame sz  font sz  AA                border   bold */
-	//new FontDef("_japanese 16px", "MS-Gothic", JAFontPages, 32,       20,      AntiAlias.STRONG, 2,       true),
-	//new FontDef("_japanese 24px", "MS-Gothic", JAFontPages, 32,       28,      AntiAlias.SMOOTH, 2,       true)
-	new FontDef("_korean 16px",     "ArialUnicodeMS",     KRFontPages, 32,       20,      AntiAlias.SMOOTH, 2,       true),
-	new FontDef("_korean 24px",     "ArialUnicodeMS",     KRFontPages, 32,       28,      AntiAlias.SMOOTH, 2,       true)
+	new FontDef("_japanese 16px", "MS-Gothic", JAFontPages, 32,       20,      AntiAlias.STRONG, 2,       true),
+	new FontDef("_japanese 24px", "MS-Gothic", JAFontPages, 32,       28,      AntiAlias.SMOOTH, 2,       true)
+	//new FontDef("_korean 16px",   "ArialUnicodeMS", KRFontPages, 32,       20,      AntiAlias.SMOOTH, 2,       true),
+	//new FontDef("_korean 24px",   "ArialUnicodeMS", KRFontPages, 32,       28,      AntiAlias.SMOOTH, 2,       true)
 		);