diff --git a/65-baekmuk-ttf-batang.conf b/65-baekmuk-ttf-batang.conf
index ecd1a90..eb096a3 100644
--- a/65-baekmuk-ttf-batang.conf
+++ b/65-baekmuk-ttf-batang.conf
@@ -1,19 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Baekmuk Batang</family>
-		<default>
-            <family>serif</family>
-        </default>
-	</alias>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Baekmuk Batang</family>
-		</prefer>
-	</alias>
+  <match>
+    <test name="lang">
+      <string>ko</string>
+    </test>
+    <test name="family">
+      <string>serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>Baekmuk Batang</string>
+    </edit>
+  </match>
+  <alias>
+    <family>Baekmuk Batang</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
 </fontconfig>
diff --git a/65-baekmuk-ttf-dotum.conf b/65-baekmuk-ttf-dotum.conf
index 32392b2..ab38479 100644
--- a/65-baekmuk-ttf-dotum.conf
+++ b/65-baekmuk-ttf-dotum.conf
@@ -1,19 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Baekmuk Dotum</family>
-		<default>
-            <family>sans-serif</family>
-        </default>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Baekmuk Dotum</family>
-		</prefer>
-	</alias>
+  <match>
+    <test name="lang">
+      <string>ko</string>
+    </test>
+    <test name="family">
+      <string>sans-serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>Baekmuk Dotum</string>
+    </edit>
+  </match>
+  <alias>
+    <family>Baekmuk Dotum</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
 </fontconfig>
diff --git a/65-baekmuk-ttf-gulim.conf b/65-baekmuk-ttf-gulim.conf
index 4d67ff8..49ba2c0 100644
--- a/65-baekmuk-ttf-gulim.conf
+++ b/65-baekmuk-ttf-gulim.conf
@@ -1,19 +1,21 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
-<!--
-  monospace faces
- -->
-	<alias>
-		<family>Baekmuk Gulim</family>
-		<default>
-            <family>monospace</family>
-        </default>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Baekmuk Gulim</family>
-		</prefer>
-	</alias>
+  <match>
+    <test name="lang">
+      <string>ko</string>
+    </test>
+    <test name="family">
+      <string>monospace</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>Baekmuk Gulim</string>
+    </edit>
+  </match>
+  <alias>
+    <family>Baekmuk Gulim</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
 </fontconfig>
diff --git a/baekmuk-ttf-fonts.spec b/baekmuk-ttf-fonts.spec
index 8f3773d..a8d6c98 100644
--- a/baekmuk-ttf-fonts.spec
+++ b/baekmuk-ttf-fonts.spec
@@ -8,7 +8,7 @@ This package provides the free Korean TrueType fonts.
 
 Name:           %{fontname}-fonts
 Version:        2.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Free Korean TrueType fonts
 
 Group:          User Interface/X
@@ -152,6 +152,9 @@ cd -
 %__rm -rf %{buildroot}
 
 %changelog
+* Mon Feb 02 2009 Caius Chance <cchance@redhat.com> - 2.2-18.fc11
+- Updated fontconfig .conf files based on fontpackages templates.
+
 * Tue Jan 27 2009 Caius Chance <cchance@redhat.com> - 2.2-17.fc11
 - Resolves: rhbz#477332
 - Fixed obsoletion of baekmuk-ttf-common-fonts.