diff --git a/.cvsignore b/.cvsignore
index 7075f01..7dadd10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-20070509-1766.tar.bz2
+dejavu-sfd-2.17.tar.bz2
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index b3d30a5..18412e6 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -1,26 +1,29 @@
-%define archivename     dejavu-sfd
+%define fontname        dejavu
+%define fontdir         %{_datadir}/fonts/%{fontname}
+%define fontconfdir     %{_sysconfdir}/fonts
+
 
 #define alphatag        .20070509svn1766
-%define alphatag        .rc1
+#define alphatag        .rc1
+
+%define archivename     %{fontname}-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  20070509-1766
-#define archiveversion  %{version}
+#define archiveversion  20070509-1766
+%define archiveversion  %{version}
 
-%define fontdir         %{_datadir}/fonts/%{name}
-%define fontconfdir     %{_sysconfdir}/fonts
 
-# Let the perl maintainer worry about Unicode.org data files (updates, licensing…)
+# Let the perl maintainer worry about Unicode.org data files
 %define Blocks          %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
-Name:      dejavu-fonts
+Name:      %{fontname}-fonts
 Version:   2.17
-Release:   0.3%{?alphatag}%{?dist}
+Release:   1%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
-URL:       http://dejavu.sf.net/
-Source0:   http://dejavu.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
+URL:       http://%{fontname}.sf.net/
+Source0:   http://%{fontname}.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
 # DejaVu fontconfig setup
 Source1:   %{name}-fontconfig.conf
 Source2:   %{name}-fontconfig-unhint-small.conf
@@ -28,7 +31,8 @@ Source2:   %{name}-fontconfig-unhint-small.conf
 Source3:   %{name}-experimental-fontconfig.conf
 Source4:   %{name}-experimental-fontconfig-unhint-small.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fontforge >= 20061019-1
+# Older fontforge versions may not work, current fontforge definitely won't
+BuildRequires: fontforge = 20061220
 # The CPAN sources do not declare perl(Font::TTF)
 BuildRequires: perl-Font-TTF
 # Needed to compute unicode coverage
@@ -46,13 +50,6 @@ BuildArch: noarch
 # found in older Fedora releases
 Conflicts: fontconfig < 2.4.0
 
-Obsoletes: %{name}-fontconfig < 2.7.0-0.15
-Obsoletes: %{name}-makedefault < 2.9.0-1
-Obsoletes: %{name}-block < 2.9.0-1
-
-Provides: %{name}-makedefault = %{version}
-Provides: %{name}-fontconfig = %{version}
-
 
 %description
 The DejaVu fonts are a font family based on the "Bitstream Vera" fonts release
@@ -79,6 +76,7 @@ This package includes the typefaces the DejaVu project considers experimental.
 %prep
 %setup -q -n %{archivename}-%{archiveversion}
 
+
 %build
 ./generate.sh
 ./status.pl %{version} status.txt *.sfd > status.txt.new
@@ -91,6 +89,8 @@ mv status.txt.new status.txt
 # but it requires resolution of 
 # https://bugs.freedesktop.org/show_bug.cgi?id=6316 
 
+# Remove mes files or they end in %doc
+rm mes*.txt
 
 %check
 # Current upstream files are full of "problems"
@@ -105,41 +105,42 @@ mv status.txt.new status.txt
 install -d -m 0755 %{buildroot}%{fontdir}
 install -m 0644 generated/*.ttf  %{buildroot}%{fontdir}
 
-# Fontconfig overrides for some scripts
+# Fontconfig tweaks
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
-install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-%{fontname}.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
+install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
+install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
+
 
 %clean
-/bin/rm -rf %{buildroot}
+/bin/rm -fr %{buildroot}
 
 
 %post
-if [ -x %{_bindir}/fc-cache ]; then 
-  %{_bindir}/fc-cache %{_datadir}/fonts
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache /usr/share/fonts
 fi
 
 
 %postun
 if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then 
-    %{_bindir}/fc-cache %{_datadir}/fonts
+  if [ -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache /usr/share/fonts
   fi
 fi
 
 
 %post experimental
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{_datadir}/fonts
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache /usr/share/fonts
 fi
 
 
 %postun experimental
 if [ "$1" = "0" ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{_datadir}/fonts
+  if [ -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache /usr/share/fonts
   fi
 fi
 
@@ -148,8 +149,8 @@ fi
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
-%config(noreplace) %{fontconfdir}/conf.d/57-dejavu.conf
+%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}.conf
+%config(noreplace) %{fontconfdir}/conf.d/57-%{fontname}.conf
 
 %dir %{fontdir}
 %{fontdir}/DejaVu*.ttf
@@ -161,8 +162,8 @@ fi
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
-%config(noreplace) %{fontconfdir}/conf.d/61-dejavu-experimental.conf
+%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-%{fontname}-experimental.conf
+%config(noreplace) %{fontconfdir}/conf.d/61-%{fontname}-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -170,6 +171,15 @@ fi
 
 
 %changelog
+* Sun May 13 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+☺ 2.17-1
+✓ rebase scriptlets from guidelines
+✓ fontforge broke compat: BR the current version, ask for a version bump
+  before 2.18 is released
+✓ simplify font directory naming
+✓ clean up fc5 obsoletes
+✓ remove technical mes files from doc
+
 * Fri May 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 2.17-0.3.rc1
 ✓ fontconfig setup has stabilized and can be marked noreplace now
diff --git a/sources b/sources
index 1a9b525..e309972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ac5a2c51a817e1d3480df80a91b9737  dejavu-sfd-20070509-1766.tar.bz2
+829cad0b22bf001df846faff8e6cccf6  dejavu-sfd-2.17.tar.bz2