diff --git a/google-droid-fonts-sans-fontconfig.conf b/google-droid-fonts-sans-fontconfig.conf
index 38d4b60..ee4cce6 100644
--- a/google-droid-fonts-sans-fontconfig.conf
+++ b/google-droid-fonts-sans-fontconfig.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans-serif</family>
@@ -13,18 +13,6 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <alias>
-    <family>Droid Sans Japanese</family>
-    <default>
-      <family>Droid Sans</family>
-    </default>
-  </alias>
-  <alias>
-    <family>Droid Sans Fallback</family>
-    <default>
-      <family>Droid Sans</family>
-    </default>
-  </alias>
   <match target="scan">
     <test name="family">
       <string>Droid Sans</string>
@@ -55,4 +43,16 @@
       <int>1</int>
     </edit>
   </match>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
 </fontconfig>
diff --git a/google-droid-fonts-sans-mono-fontconfig.conf b/google-droid-fonts-sans-mono-fontconfig.conf
index 5c7f475..1cf8bbc 100644
--- a/google-droid-fonts-sans-mono-fontconfig.conf
+++ b/google-droid-fonts-sans-mono-fontconfig.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>monospace</family>
diff --git a/google-droid-fonts-serif-fontconfig.conf b/google-droid-fonts-serif-fontconfig.conf
index 30c1501..f56b5ed 100644
--- a/google-droid-fonts-serif-fontconfig.conf
+++ b/google-droid-fonts-serif-fontconfig.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>serif</family>
diff --git a/google-droid-fonts.spec b/google-droid-fonts.spec
index 238566e..5369e6a 100644
--- a/google-droid-fonts.spec
+++ b/google-droid-fonts.spec
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-3
+— more Behdad-suggested fontconfig tweaks
+
 * Sun Sep  7 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090906-2
 — first-level CJK fixes (as suggested by Behdad in bug #517789, complete fix
diff --git a/import.log b/import.log
index d1dedbb..3b6d277 100644
--- a/import.log
+++ b/import.log
@@ -6,3 +6,4 @@ google-droid-fonts-20090320-1_fc12:HEAD:google-droid-fonts-20090320-1.fc12.src.r
 google-droid-fonts-20090320-3_fc12:HEAD:google-droid-fonts-20090320-3.fc12.src.rpm:1248532826
 google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176
 google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928
+google-droid-fonts-20090906-3_fc12:HEAD:google-droid-fonts-20090906-3.fc12.src.rpm:1252833055
diff --git a/sources b/sources
index a4ef0ae..0d03927 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
-6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
-8fbc87c7c5089a8e86c670b93a78964f  DroidSansJapanese.ttf
+9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
+6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf