diff --git a/sportrop-fonts.spec b/sportrop-fonts.spec
index 7fdd900..944bf4c 100644
--- a/sportrop-fonts.spec
+++ b/sportrop-fonts.spec
@@ -1,10 +1,11 @@
-%define fontname        sportrop
-%define fontdir         %{_datadir}/fonts/%{fontname}
-%define fontconfdir     %{_sysconfdir}/fonts/conf.d
+%define fontname sportrop
+%define fontconf 63-%{fontname}.conf
+
+#define archivename %{name}-%{version}
 
 Name:           %{fontname}-fonts
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A multiline decorative font
 
 Group:          User Interface/X
@@ -14,11 +15,15 @@ Source0:        http://openfontlibrary.org/people/gluk/gluk_-_Sportrop.zip
 Source1:        %{name}-fontconfig.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
 BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+Requires:       fontpackages-filesystem
 
 %description
 A neat multiline font
 
+
 %prep
 %setup -c
 chmod 0644 *.txt
@@ -34,38 +39,35 @@ done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontdir}
-install -pm 644 Sportrop.ttf $RPM_BUILD_ROOT%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
-install -dm 755 $RPM_BUILD_ROOT%{fontconfdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/63-%{fontname}.conf
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
+%clean
+rm -fr %{buildroot}
 
-%post
-if [ -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
 
-%postun
-if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
-fi
+%_font_pkg -f %{fontconf} *.ttf
 
-%files
-%defattr(644,root,root,755)
 %doc OFL_FAQ.txt OFL_License.txt tabl_c.jpg
-%config(noreplace) %{fontconfdir}/63-%{fontname}.conf
-%dir %{fontdir}/
-%{fontdir}/*.ttf
+
+%dir %{_fontdir}
 
 
 %changelog
+* Mon Mar 9 2009 Jon Stanley <jonstanley@gmail.com> - 0.9-6
+- Update to new packaging guidelines
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -81,3 +83,4 @@ fi
 
 * Tue Jul 22 2008 Jon Stanley <jonstanley@gmail.com> - 0.9-1
 - Initial package
+