diff --git a/fontconfig.changes b/fontconfig.changes
index 8387cad..d1ba1bd 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Oct 16 17:39:14 CEST 2007 - mfabian@suse.de
+
+- Bugzilla #334154: make "Lohit Punjabi" the default font for
+  Punjabi (move ugly FreeSans, FreeSerif, FreeMono down in
+  the preference lists to make this possible).
+
+-------------------------------------------------------------------
+Tue Oct 16 16:18:27 CEST 2007 - mfabian@suse.de
+
+- Bugzilla #308961 comment #24: give "AR PL ShanHeiSun Uni" higher
+  priority than FZMingTi because the latter one doesn’t have
+  embedded bitmaps.
+
 -------------------------------------------------------------------
 Mon Oct 15 16:58:24 CEST 2007 - mfabian@suse.de
 
diff --git a/fontconfig.spec b/fontconfig.spec
index 3017420..506cb0c 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -23,7 +23,7 @@ Url:            http://fontconfig.org/
 AutoReqProv:    on
 Requires:       bash
 Version:        2.4.2
-Release:        47
+Release:        48
 Summary:        Library for Font Configuration
 # CVS can be found here: (CVS is gone, fontconfig uses git now).
 # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
@@ -231,6 +231,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/Fc*
 %{myprefix}/include/fontconfig/
 %changelog
+* Tue Oct 16 2007 - mfabian@suse.de
+- Bugzilla #334154: make "Lohit Punjabi" the default font for
+  Punjabi (move ugly FreeSans, FreeSerif, FreeMono down in
+  the preference lists to make this possible).
+* Tue Oct 16 2007 - mfabian@suse.de
+- Bugzilla #308961 comment #24: give "AR PL ShanHeiSun Uni" higher
+  priority than FZMingTi because the latter one doesn’t have
+  embedded bitmaps.
 * Mon Oct 15 2007 - mfabian@suse.de
 - Bugzilla #308961: make "AR PL ShanHeiSun Uni" the default font
   for traditional and simplified Chinese (unless the commercial
diff --git a/suse-post-user.conf b/suse-post-user.conf
index 0b7524a..a8c5514 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -19,13 +19,14 @@
 			<family>Luxi Serif</family>
 			<family>Likhan</family>
 			<family>Frank Ruehl CLM</family>
-			<family>FreeSerif</family>
 			<family>Times</family>
 			<family>Khmer OS System</family>
+			<family>Lohit Punjabi</family>
 			<family>Pothana2000</family>
 			<family>TSCu_Times</family>
 			<family>BPG Chveulebrivi</family>
 			<family>Nazli</family>
+			<family>FreeSerif</family>
 			<family>MS PMincho</family>
 			<family>MS Mincho</family>
 			<family>HGPMinchoL</family>
@@ -36,8 +37,8 @@
 			<family>Kochi Mincho</family>
 			<family>CMEXSong</family>
 			<family>FZSongTi</family>
-			<family>FZMingTiB</family>
 			<family>AR PL ShanHeiSun Uni</family>
+			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>UnBatang</family>
@@ -60,13 +61,14 @@
 			<family>Luxi Sans</family>
 			<family>Mukti Narrow</family>
 			<family>Nachlieli CLM</family>
-			<family>FreeSans</family>
 			<family>Helvetica</family>
 			<family>Khmer OS System</family>
+			<family>Lohit Punjabi</family>
 			<family>Pothana2000</family>
 			<family>TSCu_Paranar</family>
 			<family>BPG Glaho</family>
 			<family>Terafik</family>
+			<family>FreeSans</family>
 			<family>Meiryo</family>
 			<family>MS PGothic</family>
 			<family>MS Gothic</family>
@@ -78,8 +80,8 @@
 			<family>Kochi Gothic</family>
 			<family>CMEXSong</family>
 			<family>FZSongTi</family>
-			<family>FZMingTiB</family>
 			<family>AR PL ShanHeiSun Uni</family>
+			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>UnDotum</family>
@@ -101,12 +103,13 @@
 			<family>Luxi Mono</family>
 			<family>Mukti Narrow</family>
 			<family>Miriam Mono CLM</family>
-			<family>FreeMono</family>
 			<family>Terafik</family>
 			<family>Khmer OS System</family>
+			<family>Lohit Punjabi</family>
 			<family>Pothana2000</family>
 			<family>TSCu_Paranar</family>
 			<family>BPG Courier</family>
+			<family>FreeMono</family>
 			<family>MS Gothic</family>
 			<family>HGGothicB</family>
 			<family>IPAGothic</family>
@@ -114,8 +117,8 @@
 			<family>Kochi Gothic</family>
 			<family>CMEXSong</family>
 			<family>FZSongTi</family>
-			<family>FZMingTiB</family>
 			<family>AR PL ShanHeiSun Uni</family>
+			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>UnDotum</family>