diff --git a/gfs-garaldus-fonts-fontconfig.conf b/gfs-garaldus-fonts-fontconfig.conf
index 1cf374f..c4eb7f3 100644
--- a/gfs-garaldus-fonts-fontconfig.conf
+++ b/gfs-garaldus-fonts-fontconfig.conf
@@ -2,15 +2,15 @@
 <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
 <fontconfig>
   <alias>
-    <family>GFS Garaldus</family>
-    <default>
-      <family>fantasy</family>
-    </default>
-  </alias>
-  <alias>
     <family>fantasy</family>
     <prefer>
       <family>GFS Garaldus</family>
     </prefer>
   </alias>
+  <alias>
+    <family>GFS Garaldus</family>
+    <default>
+      <family>fantasy</family>
+    </default>
+  </alias>
 </fontconfig>
diff --git a/gfs-garaldus-fonts.spec b/gfs-garaldus-fonts.spec
index de868e6..f6f6563 100644
--- a/gfs-garaldus-fonts.spec
+++ b/gfs-garaldus-fonts.spec
@@ -1,22 +1,23 @@
-%define fontname    gfs-garaldus
-%define fontdir     %{_datadir}/fonts/%{fontname}
-%define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define fontname gfs-garaldus
+%define fontconf 61-%{fontname}.conf
 
 %define archivename GFS_GARALDUS
 
 Name:    %{fontname}-fonts
 Version: 20080707
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: GFS Garaldus majuscule Greek font
 
-Group:   User Interface/X
-License: OFL
-URL:     http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
-Source0: http://www.greekfontsociety.gr/%{archivename}.zip
-Source1: %{name}-fontconfig.conf
-
+Group:     User Interface/X
+License:   OFL
+URL:       http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
+Source0:   http://www.greekfontsociety.gr/%{archivename}.zip
+Source1:   %{name}-fontconfig.conf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch: noarch
+
+BuildArch:     noarch
+BuildRequires: fontpackages-devel
+Requires:      fontpackages-filesystem
 
 %description
 As it is known, the Greek alphabet was used in majuscule form for over a
@@ -49,46 +50,41 @@ done
 
 
 %build
-# Nothing there
 
 
 %install
 rm -fr %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.otf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.otf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/61-%{fontname}.conf
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 
 %clean
 rm -fr %{buildroot}
 
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
-
-
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache %{fontdir} || :
-fi
+%_font_pkg -f %{fontconf} *.otf
 
-
-%files
-%defattr(0644,root,root,0755)
 %doc *.txt
+%dir %{_fontdir}
 
-%config(noreplace) %{fontconfdir}/61-%{fontname}.conf
-
-%dir %{fontdir}/
-%{fontdir}/*.otf
+%changelog
+* Sun Nov 23 2008 <nicolas.mailhot at laposte.net>
+- 20080707-3
+ᛤ ‘rpm-fonts’ renamed to “fontpackages”
 
+* Fri Nov 14 2008 <nicolas.mailhot at laposte.net>
+- 20080707-2
+▤ Rebuild using new « rpm-fonts »
 
-%changelog
 * Mon Jul 21 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20080707-1
 Φ initial packaging
diff --git a/import.log b/import.log
index e50307a..17780a8 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 gfs-garaldus-fonts-20080707-1_fc10:HEAD:gfs-garaldus-fonts-20080707-1.fc10.src.rpm:1216755659
+gfs-garaldus-fonts-20080707-3_fc11:HEAD:gfs-garaldus-fonts-20080707-3.fc11.src.rpm:1229542939