diff --git a/.cvsignore b/.cvsignore
index 3ecf2f6..2f89fb4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-2.18.tar.bz2
+dejavu-sfd-2.19.tar.bz2
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 71a3bdc..238e3b5 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -1,6 +1,6 @@
 %define fontname        dejavu
-%define fontdir         %{_datadir}/fonts/%{fontname}
-%define fontconfdir     %{_sysconfdir}/fonts
+%define fontdir         %{_datadir}/fonts/%{fontname}/
+%define fontconfdir     %{_sysconfdir}/fonts/conf.d/
 
 %define archivename     %{fontname}-sfd-%{archiveversion}
 
@@ -16,7 +16,7 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      %{fontname}-fonts
-Version:   2.18
+Version:   2.19
 Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 
@@ -94,11 +94,11 @@ install -m 0755 -d %{buildroot}%{fontdir}
 install -m 0644 -p generated/*.ttf  %{buildroot}%{fontdir}
 
 # Fontconfig tweaks
-install -m 0755 -d %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-%{fontname}.conf
-install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
-install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
+install -m 0755 -d %{buildroot}%{fontconfdir}
+install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}57-%{fontname}.conf
+install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}.conf
+install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}61-%{fontname}-experimental.conf
+install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
 
 
 %clean
@@ -106,29 +106,29 @@ rm -fr %{buildroot}
 
 
 %post
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache /usr/share/fonts
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache %{fontdir}
 fi
 
 
 %postun
 if [ "$1" = "0" ]; then
-  if [ -x /usr/bin/fc-cache ]; then
-    /usr/bin/fc-cache /usr/share/fonts
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir}
   fi
 fi
 
 
 %post experimental
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache /usr/share/fonts
+if [ -x %{_bindir}/fc-cache ]; then
+  %{_bindir}/fc-cache %{fontdir}
 fi
 
 
 %postun experimental
 if [ "$1" = "0" ]; then
-  if [ -x /usr/bin/fc-cache ]; then
-    /usr/bin/fc-cache /usr/share/fonts
+  if [ -x %{_bindir}/fc-cache ]; then
+    %{_bindir}/fc-cache %{fontdir}
   fi
 fi
 
@@ -137,8 +137,8 @@ fi
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
-%config(noreplace) %{fontconfdir}/conf.d/57-%{fontname}.conf
+%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}.conf
+%config(noreplace) %{fontconfdir}57-%{fontname}.conf
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
@@ -150,8 +150,8 @@ fi
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
-%config(noreplace) %{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}20-unhint-small-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}61-%{fontname}-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -159,6 +159,11 @@ fi
 
 
 %changelog
+* Sat Aug 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+☺ 2.19-1
+✓ 2.19 final
+✓ expand macro use
+
 * Sun Jul 1 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 2.18-1
 ✓ 2.18 final
diff --git a/sources b/sources
index f2e15dd..287dba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-268eef74ec1bf21928c705fc10b0372e  dejavu-sfd-2.18.tar.bz2
+28d65cd8e2ba992bb4974a02407e76de  dejavu-sfd-2.19.tar.bz2