diff --git a/publican.spec b/publican.spec
index dd0420c..767b400 100644
--- a/publican.spec
+++ b/publican.spec
@@ -1,12 +1,12 @@
 %define	my_vendor fedora
 %define	EMBED_DOCKBOOK45 0
 %define	HTMLVIEW 0
-%define PREMOLESTATION 0
+%define RHEL 0
 
 Name:		publican	
 Summary:	Common files and scripts for publishing with DocBook XML
 Version:	0.40
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+ and GFDL
 # The following directories are licensed under the GFDL:
 #	content, Book_Template, Set_Template, Article_Template
@@ -30,9 +30,8 @@ BuildRequires:	perl-XML-TreeBuilder >= 3.09-11
 BuildRequires:	fop
 BuildRequires: ImageMagick saxon
 #BuildRequires:	xslthl
-# *&%^*&^ decided to rename font packages and change font paths.
-# No actual real changes.
-%if %{PREMOLESTATION}
+# Fedora renamed its fonts under upstream package names and subpackaged families
+%if %{RHEL}
 Requires:	xslthl
 Requires:	fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
 Requires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
@@ -44,15 +43,17 @@ BuildRequires:	fonts-hindi fonts-japanese fonts-kannada fonts-korean
 BuildRequires:	fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
 BuildRequires:	fonts-tamil fonts-telugu liberation-fonts
 %else
+Requires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 Requires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
-Requires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
+Requires:	lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada
 Requires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-Requires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts-compat baekmuk-ttf-batang-fonts
+Requires:	lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts
 
+BuildRequires:	liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 BuildRequires:	lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati
-BuildRequires:	lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada
+BuildRequires:	lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada
 BuildRequires:	lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts
-BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu liberation-fonts-compat baekmuk-ttf-batang-fonts
+BuildRequires:	lohit-fonts-tamil lohit-fonts-telugu baekmuk-ttf-batang-fonts
 %endif
 
 URL:		https://fedorahosted.org/publican
@@ -146,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Mon Feb  9 2009 Jens Petersen <petersen@redhat.com> - 0.40-4
+- update the sazanami-fonts subpackage names
+- list liberation-fonts subpackages explicitly
+
 * Fri Feb  6 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.40-3
 - Fix broken font deps: liberation-fonts -> liberation-fonts-compat