diff --git a/gnu-free-fonts.changes b/gnu-free-fonts.changes
index 236286f..f3428a8 100644
--- a/gnu-free-fonts.changes
+++ b/gnu-free-fonts.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  4 12:39:06 CEST 2012 - pgajdos@suse.cz
+
+- amend spec file to reflect new font packaging scheme
+  (see openFATE#313536);
+
 -------------------------------------------------------------------
 Thu May 17 09:10:05 UTC 2012 - pgajdos@suse.com
 
diff --git a/gnu-free-fonts.spec b/gnu-free-fonts.spec
index e91ec6f..53ac405 100644
--- a/gnu-free-fonts.spec
+++ b/gnu-free-fonts.spec
@@ -17,15 +17,15 @@
 
 
 %define fontname    freefont
-%define ttf_fontdir /usr/share/fonts/truetype
+%define _ttfontsdir /usr/share/fonts/truetype
 
 Name:           gnu-free-fonts
 Version:        0.20111101
 Release:        0
-License:        SUSE-GPL-3.0+-with-font-exception
 Summary:        Free UCS Outline Fonts
-Url:            http://savannah.nongnu.org/projects/freefont/
+License:        SUSE-GPL-3.0+-with-font-exception
 Group:          System/X11/Fonts
+Url:            http://savannah.nongnu.org/projects/freefont/
 #    svn co svn://svn.savannah.gnu.org/freefont/trunk/freefont
 #    tar jcvf freefont-0.20080323.tar.bz2 freefont/
 Source0:        %{fontname}-%{version}.tar.bz2
@@ -33,15 +33,16 @@ Source10:       remove-kana-glyphs
 # TODO: remove GenerateTrueType script from previous version (20080323) as soon as the new one is working
 Source11:       GenerateTrueType
 BuildRequires:  fontforge >= 20080429
+BuildRequires:  fontpackages-devel
 BuildRequires:  python
-Requires(pre):  %suseconfig_fonts_prereq
+%reconfigure_fonts_prereq
 # FIXME: This causes a rpmlint warning; change <= to < once there's a new upstream version
 Obsoletes:      %{fontname} <= 0.20111101
 Provides:       %{fontname} = %{version}
 Provides:       scalable-font-bg
-Provides:       scalable-font-el,
-Provides:       scalable-font-he,
-Provides:       scalable-font-ru,
+Provides:       scalable-font-el
+Provides:       scalable-font-he
+Provides:       scalable-font-ru
 Provides:       locale(bg;el;he;ru;vi)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -65,19 +66,15 @@ $RPM_SOURCE_DIR/remove-kana-glyphs ./sfd/*.sfd
 fontforge -lang=ff -script ./tools/GenerateTrueType *.sfd
 
 %install
-mkdir -p %{buildroot}%{ttf_fontdir}/
-install -c -m 644 *.ttf %{buildroot}%{ttf_fontdir}/
+mkdir -p %{buildroot}%{_ttfontsdir}/
+install -c -m 644 *.ttf %{buildroot}%{_ttfontsdir}/
 
-%post
-%run_suseconfig_fonts
-
-%postun
-%run_suseconfig_fonts
+%reconfigure_fonts_scriptlets
 
 %files
 %defattr(-, root,root)
 %doc AUTHORS CREDITS ChangeLog README
 %doc papers/
-%{ttf_fontdir}
+%{_ttfontsdir}
 
 %changelog