diff --git a/google-droid-fonts-sans-fontconfig.conf b/google-droid-fonts-sans-fontconfig.conf
index 614b63f..38d4b60 100644
--- a/google-droid-fonts-sans-fontconfig.conf
+++ b/google-droid-fonts-sans-fontconfig.conf
@@ -13,27 +13,46 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <!-- CJK users should check this actually works for them -->
+  <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="lang">
-      <string>ja-jp</string>
+    <test name="family">
+      <string>Droid Sans</string>
     </test>
+    <edit name="fontversion">
+      <int>3</int>
+    </edit>
+  </match>
+  <match target="scan">
     <test name="family">
       <string>Droid Sans Japanese</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
   </match>
   <match target="scan">
-    <test name="lang" compare="not_eq">
-      <string>ja-jp</string>
-    </test>
     <test name="family">
       <string>Droid Sans Fallback</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
     </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
   </match>
 </fontconfig>
diff --git a/google-droid-fonts.spec b/google-droid-fonts.spec
index ececc4f..238566e 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: 1%{?dist}
+Release: 2%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -138,6 +138,11 @@ rm -fr %{buildroot}
 
 
 %changelog
+* 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
+   needs the rpm changes traced in bug #521697)
+
 * Sun Sep  6 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20090906-1
 — upstream stealth update
diff --git a/import.log b/import.log
index 5fa0759..d1dedbb 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ google-droid-fonts-1_0_112-5_fc11:HEAD:google-droid-fonts-1.0.112-5.fc11.src.rpm
 google-droid-fonts-20090320-1_fc12:HEAD:google-droid-fonts-20090320-1.fc12.src.rpm:1248519226
 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
diff --git a/sources b/sources
index 0d03927..a4ef0ae 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,5 @@
 a062025df92affc1331a05b7c07793fc  DroidSerif-BoldItalic.ttf
 a2e7305a0ba8bb7091124f4cd1485fc9  DroidSerif-Italic.ttf
 bfb2f44a7c1deba39f7f4d39bff18eeb  DroidSerif-Regular.ttf
-9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
-6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf
+6f28ad369fa0f2661cc2de7a7be9977e  DroidSans.ttf
+8fbc87c7c5089a8e86c670b93a78964f  DroidSansJapanese.ttf