diff --git a/30-aliases-fedora.conf b/30-aliases-fedora.conf
index 6e6d81c..4e20bd3 100644
--- a/30-aliases-fedora.conf
+++ b/30-aliases-fedora.conf
@@ -2,43 +2,167 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- conf.d/sub-pixel.conf -->
 <fontconfig>
-        <alias>
-	  <family>Courier</family>
-	  <accept>
-	    <family>Courier New</family>
-        </accept>
-	</alias>
+
+	<!-- Alias similar families from 5 sources:
+
+		PostScript fonts:
+			Helvetica
+			Times
+			Courier
+		Microsoft fonts:
+			Arial
+			Times New Roman
+			Courier New
+		URW fonts:
+			Nimbus Sans L
+			Nimbus Roman No9 L
+			Nimbus Mono L
+		StarOffice fonts:
+			Albany
+			Thorndale
+			Cumberland
+		AMT fonts:
+			Albany AMT
+			Thorndale AMT
+			Cumberland AMT
+
+	     Of these, URW fonts are metric compatible with PostScrict fonts
+	     and the StarOffice and AMT ones are compatible with Microsoft
+	     fonts.  We want for each of them to fallback to any of these
+	     available, but in an order preferring the metric-compatible ones
+	     first.  As an exception, we assume that URW fonts are always
+	     available and do not alias them.
+
+	     It seems to be really hard to do this with fontconfig.  The
+	     easiest way seems to be to list them all for each one.
+	-->
+
+	<!-- PostScript -->
         <alias>
 	  <family>Helvetica</family>
 	  <accept>
-	    <family>Arial</family>
+	  <family>Nimbus Sans L</family>
+	  <family>Arial</family>
+	  <family>Albany</family>
+	  <family>Albany AMT</family>
 	  </accept>
 	</alias>
+
         <alias>
 	  <family>Times</family>
 	  <accept>
-	    <family>Times New Roman</family>
+	  <family>Nimbus Roman No9 L</family>
+	  <family>Times New Roman</family>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
 	  </accept>
 	</alias>
- 	<alias>
-		<family>Thorndale</family>
-		<accept>
-		  <family>Thorndale AMT</family>
-		  <family>Times New Roman</family>
-		</accept>
+
+        <alias>
+	  <family>Courier</family>
+	  <accept>
+	  <family>Nimbus Mono L</family>
+	  <family>Courier New</family>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  </accept>
 	</alias>
- 	<alias>
-		<family>Albany</family>
-		<accept>
-		  <family>Albany AMT</family>
-		  <family>Arial</family>
-		</accept>
+
+
+
+	<!-- Microsoft -->
+        <alias>
+	  <family>Arial</family>
+	  <accept>
+	  <family>Albany</family>
+	  <family>Albany AMT</family>
+	  <family>Helvetica</family>
+	  <family>Nimbus Sans L</family>
+	  </accept>
 	</alias>
- 	<alias>
-		<family>Cumberland</family>
-		<accept>
-		  <family>Cumberland AMT</family>
-		  <family>Courier New</family>
-		</accept>
+
+        <alias>
+	  <family>Times New Roman</family>
+	  <accept>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
+	  <family>Times</family>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
 	</alias>
+
+        <alias>
+	  <family>Courier New</family>
+	  <accept>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  <family>Courier</family>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+
+	<!-- StarOffice -->
+        <alias>
+	  <family>Albany</family>
+	  <accept>
+	  <family>Arial</family>
+	  <family>Albany AMT</family>
+	  <family>Helvetica</family>
+	  <family>Nimbus Sans L</family>
+	  </accept>
+	</alias>
+
+        <alias>
+	  <family>Thorndale</family>
+	  <accept>
+	  <family>Times New Roman</family>
+	  <family>Thorndale AMT</family>
+	  <family>Times</family>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
+	</alias>
+
+        <alias>
+	  <family>Cumberland</family>
+	  <accept>
+	  <family>Courier New</family>
+	  <family>Cumberland AMT</family>
+	  <family>Courier</family>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+
+	<!-- AMT -->
+        <alias>
+	  <family>Albany AMT</family>
+	  <accept>
+	  <family>Arial</family>
+	  <family>Albany</family>
+	  <family>Helvetica</family>
+	  <family>Nimbus Sans L</family>
+	  </accept>
+	</alias>
+
+        <alias>
+	  <family>Thorndale AMT</family>
+	  <accept>
+	  <family>Times New Roman</family>
+	  <family>Thorndale</family>
+	  <family>Times</family>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
+	</alias>
+
+        <alias>
+	  <family>Cumberland AMT</family>
+	  <accept>
+	  <family>Courier New</family>
+	  <family>Cumberland</family>
+	  <family>Courier</family>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
 </fontconfig>
diff --git a/fontconfig.spec b/fontconfig.spec
index 188c27a..e5ab3dc 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -141,6 +141,10 @@ fi
 %{_mandir}/man3/*
 
 %changelog
+* Fri Sep 22 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.1-2
+- Update 30-aliases-fedora.conf to correctly alias MS and StarOffice
+  fonts. (#207460)
+
 * Fri Sep 15 2006 Behdad Esfahbod <besfahbo@redhat.com> - 2.4.1-1
 - Update to 2.4.1, a public API was dropped from 2.4.0
 - Remove upstreamed patch