diff --git a/.cvsignore b/.cvsignore
index 504cd52..62044f0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-2.8.tar.gz
+dejavu-sfd-2.9.tar.gz
diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf
index 685aaf8..064f205 100644
--- a/dejavu-fonts-experimental-fontconfig.conf
+++ b/dejavu-fonts-experimental-fontconfig.conf
@@ -13,49 +13,40 @@
      $Id$
 -->
 <fontconfig>
-<!-- Declare generics -->
-  <alias>
-    <family>DejaVu Sans Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif Condensed</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
 <!-- Declare substitutes -->
-  <alias>
-    <family>DejaVu LGC Sans Condensed</family>
-    <accept>
-      <family>DejaVu LGC Sans Condensed</family>
-      <family>DejaVu Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Toga Sans</family>
-    <accept>
-      <family>Toga Sans</family>
-      <family>DejaVu Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Serif Condensed</family>
-    <accept>
-      <family>DejaVu LGC Serif Condensed</family>
-      <family>DejaVu Serif Condensed</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Toga Serif</family>
-    <accept>
-      <family>Toga Serif</family>
-      <family>DejaVu Serif Condensed</family>
-    </accept>
-  </alias>
-<!--  Use the same trick as Bitstream Vera -->
+  <match>
+    <test name="family">
+      <string>DejaVu LGC Sans Condensed</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Condensed</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Toga Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Condensed</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu LGC Serif Condensed</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif Condensed</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Toga Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif Condensed</string>
+    </edit>
+  </match>
+<!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">
       <string>DejaVu Sans Condensed</string>
@@ -67,7 +58,7 @@
       <bool>false</bool>
     </edit>
   </match>
-  <match target="font"> 
+  <match target="font">
     <test name="family">
       <string>DejaVu Serif Condensed</string>
     </test>
diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf
index 03584f2..9d7b2ae 100644
--- a/dejavu-fonts-fontconfig.conf
+++ b/dejavu-fonts-fontconfig.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/conf.d/20-dejavu.conf
 
-     Define aliasing ant other fontconfig settings for DejaVu main families
+     Define aliasing and other fontconfig settings for DejaVu main families
 
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
      This file is distributed under the terms of the GNU General
@@ -12,159 +12,182 @@
      $Id$
 -->
 <fontconfig>
-<!-- Declare generics -->
-  <alias>
-    <family>DejaVu Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-<!-- Monospace face -->
-  <alias>
-    <family>DejaVu Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
 <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
      derivatives which kept original metrics -->
-  <alias>
-    <family>Bitstream Vera Sans</family>
-    <accept>
-      <family>Bitstream Vera Sans</family>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Arev Sans</family>
-    <accept>
-      <family>Arev Sans</family>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>SUSE Sans</family>
-    <accept>
-      <family>SUSE Sans</family>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Hunky Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-      <family>Hunky Sans</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Verajja</family>
-    <accept>
-      <family>DejaVu Sans</family>
-      <family>Verajja</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Bepa</family>
-    <accept>
-      <family>DejaVu Sans</family>
-      <family>Bepa</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Olwen Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-      <family>Olwen Sans</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>Bitstream Vera Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu LGC Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Arev Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>SUSE Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Hunky Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Verajja</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Bepa</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Olwen Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
 <!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
      derivatives which kept the original metrics -->
-  <alias>
-    <family>Bitstream Vera Serif</family>
-    <accept>
-      <family>Bitstream Vera Serif</family>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>SUSE Serif</family>
-    <accept>
-      <family>SUSE Serif</family>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Hunky Serif</family>
-    <accept>
-      <family>Hunky Serif</family>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Olwen Serif</family>
-    <accept>
-      <family>Olwen Serif</family>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
+  <match>
+    <test name="family">
+      <string>Bitstream Vera Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu LGC Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>SUSE Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Hunky Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Olwen Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
 <!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
      Sans Mono derivatives which kept the original metrics -->
-  <alias>
-    <family>Bitstream Vera Sans Mono</family>
-    <accept>
-      <family>Bitstream Vera Sans Mono</family>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>SUSE Sans Mono</family>
-    <accept>
-      <family>SUSE Sans Mono</family>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Bepa Mono</family>
-    <accept>
-      <family>Bepa Mono</family>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias>
-    <family>Olwen Sans Mono</family>
-    <accept>
-      <family>Olwen Sans Mono</family>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-<!-- Use the same trick as Bitstream Vera -->
+  <match>
+    <test name="family">
+      <string>Bitstream Vera Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>DejaVu LGC Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>SUSE Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Bepa Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>Olwen Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+<!-- Alias generic names -->
+  <match>
+    <test name="family">
+      <string>sans-serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>serif</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
+      <string>monospace</string>
+    </test>
+    <edit name="family" mode="prepend" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+<!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">
       <string>DejaVu Sans</string>
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 42aeba4..575678e 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -3,7 +3,7 @@
 #%define alphatag       20060618svn945
 #%define alphatag       rc1
 
-%define archiveversion  2.8
+%define archiveversion  2.9
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -12,8 +12,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.8.0
-Release:   2%{?dist}
+Version:   2.9.0
+Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -35,8 +35,8 @@ BuildArch: noarch
 Conflicts: fontconfig < 2.3.93
 
 Obsoletes: %{name}-fontconfig < 2.7.0-0.15
-Obsoletes: %{name}-makedefault < 2.8.0-0.2
-Obsoletes: %{name}-block < 2.8.0-0.2
+Obsoletes: %{name}-makedefault < 2.9.0-1
+Obsoletes: %{name}-block < 2.9.0-1
 
 
 %description
@@ -81,7 +81,7 @@ mv status.txt.new status.txt
 %check
 # Current upstream files are full of "problems"
 # Do not panic if the output is long
-./problems.pl -l 3 *.sfd
+./problems.pl *.sfd
 
 
 %install
@@ -153,12 +153,17 @@ fi
 
 
 %changelog
+* Wed Aug 30 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.9.0-1
+- tweak fontconfig settings to match the style the dejavu-lgc core package
+  adopted
+
 * Sun Jul 30 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.8.0-2
 - Massive simplification of the spec following dejavu-lgc inclusion in FC. The
   removed parts were intended to workaround the fact no dejavu variant was in
   core. Since there is one now, and dejavu full only complements the dejavu-lgc
-  package, the lgc maintainer should take care of the corresponding settings.
+  package, core maintainers should take care of the corresponding settings.
 
 * Sun Jul 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.8.0-1
diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/sources b/sources
index 5119649..ac4d994 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3dd043f56c4eb1a54e486a78682ad67  dejavu-sfd-2.8.tar.gz
+0b04d4e8a43ec342503de954902d93eb  dejavu-sfd-2.9.tar.gz