diff --git a/jomolhari-fonts.spec b/jomolhari-fonts.spec
index c3ea486..d321c28 100644
--- a/jomolhari-fonts.spec
+++ b/jomolhari-fonts.spec
@@ -1,17 +1,19 @@
-%define	fontdir		%{_datadir}/fonts/jomolhari
+%define	fontname	jomolhari
 
-Name:		jomolhari-fonts
+Name:		%{fontname}-fonts
 Version:	0.003
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Jomolhari a Bhutanese style font for Tibetan and Dzongkha
 
 Group:		User Interface/X
 License:	OFL
 URL:		http://chris.fynn.googlepages.com/jomolhari
-Source0:	http://download.savannah.nongnu.org/releases/free-tibetan/jomolhari/jomolhari-alpha003c.zip
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://chris.fynn.googlepages.com/jomolhari-alpha003c.zip
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:	noarch
+BuildRequires:	fontpackages-devel
+Requires:	fontpackages-filesystem
 
 %description
 Jomolhari is an TrueType OpenType Bhutanese style font for Dzongkha and
@@ -26,10 +28,10 @@ The font supports the standard combinations used in most texts.
 # Empty build section
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
-install -p -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
 for i in FONTLOG.txt OFL-FAQ.txt OFL.txt
 do
@@ -37,27 +39,17 @@ do
 	mv -f ${i}.tmp $i
 done
 
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-	%{_bindir}/fc-cache %{_datadir}/fonts
-fi
-
-%postun
-if [ "$1" = "0" ]; then
-	if [ -x %{_bindir}/fc-cache ]; then
-		%{_bindir}/fc-cache %{_datadir}/fonts
-	fi
-fi
-
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-%files
-%defattr(-,root,root,-)
+%_font_pkg *.ttf
 %doc FONTLOG.txt OFL-FAQ.txt OFL.txt
-%{fontdir}/
+%dir %{_fontdir}
 
 %changelog
+* Sun Mar 15 2009 Marcin Garski <mgarski[AT]post.pl> 0.003-7
+- Update to new fonts guidelines, thanks to Rajeesh K Nambiar (#477403)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.003-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild