diff --git a/fontconfig.changes b/fontconfig.changes
index 28e95d5..9a1f63b 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,9 +1,7 @@
 -------------------------------------------------------------------
-Tue May  5 08:24:40 UTC 2015 - fstrba@suse.com
+Tue May 19 06:56:57 UTC 2015 - fstrba@suse.com
 
-- Build fontconfig against the freetype2-bootstrap-devel package
-- Don't require explicitely freetype2-devel, but let the pkgconfig
-  requires to be generated automatically.
+- Clean the spec file with spec-cleaner
 
 -------------------------------------------------------------------
 Sat Nov 29 20:51:29 UTC 2014 - bwiedemann@suse.com
diff --git a/fontconfig.spec b/fontconfig.spec
index 7bdbe3f..bf475d5 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -17,13 +17,31 @@
 
 
 %define build_docs 0
-
 Name:           fontconfig
+Version:        2.11.1
+Release:        0
+Summary:        Library for Font Configuration
+License:        MIT
+Group:          System/Libraries
+Url:            http://fontconfig.org/
+Source0:        http://fontconfig.org/release/%{name}-%{version}.tar.bz2
+Source4:        baselibs.conf
+Source5:        local.conf
+# suse specific because freetype2-bitmap-foundry.patch
+# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
+Patch0:         make-check.patch
 BuildRequires:  automake >= 1.11
-BuildRequires:  freetype2-bootstrap-devel
+BuildRequires:  freetype2-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+Requires:       bash
+Provides:       XFree86:%{_sysconfdir}/fonts/fonts.dtd
+Provides:       ipa-fonts-config = 003.02
+Obsoletes:      ipa-fonts-config <= 003.02
+Provides:       IPA-fonts-config = 003.02
+Obsoletes:      IPA-fonts-config <= 003.02
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{build_docs}
 BuildRequires:  docbook-dsssl-stylesheets
 BuildRequires:  docbook-utils
@@ -41,34 +59,15 @@ BuildRequires:  sgml-skel
 BuildRequires:  texlive-dvips
 BuildRequires:  texlive-jadetex
 %endif
-Provides:       XFree86:%{_sysconfdir}/fonts/fonts.dtd
-Url:            http://fontconfig.org/
 # bug437293
 %ifarch ppc64
 Obsoletes:      fontconfig-64bit
 %endif
-Requires:       bash
-Version:        2.11.1
-Release:        0
-Summary:        Library for Font Configuration
-License:        MIT
-Group:          System/Libraries
-Source0:        http://fontconfig.org/release/%name-%version.tar.bz2
 # After building with "build_docs" defined to "1" generate the doc tarball with:
-# tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt 
+# tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt
 %if %{build_docs} < 1
-Source1:        %name-doc-%version.tar.bz2
+Source1:        %{name}-doc-%{version}.tar.bz2
 %endif
-Source4:        baselibs.conf
-Source5:        local.conf
-# suse specific because freetype2-bitmap-foundry.patch 
-# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
-Patch0:         make-check.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Provides:       ipa-fonts-config = 003.02
-Obsoletes:      ipa-fonts-config <= 003.02
-Provides:       IPA-fonts-config = 003.02
-Obsoletes:      IPA-fonts-config <= 003.02
 
 %description
 Fontconfig is a library for configuring and customizing font access. It
@@ -77,11 +76,12 @@ an internal configuration from XML files, and the matching module,
 which accepts font patterns and returns the nearest matching font.
 
 %package devel
-Requires:       %{name} = %version
-Requires:       glibc-devel
-Provides:       XFree86-devel:%_libdir/pkgconfig/fontconfig.pc
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+Requires:       freetype2-devel
+Requires:       glibc-devel
+Provides:       XFree86-devel:%{_libdir}/pkgconfig/fontconfig.pc
 # bug437293
 %ifarch ppc64
 Obsoletes:      fontconfig-devel-64bit
@@ -117,14 +117,14 @@ chmod u+x test/run-test.sh
 chmod u+x doc/check-missing-doc
 # -----
 autoreconf -fiv
-%configure --with-pic --with-arch=%_host_cpu \
+%configure --with-pic --with-arch=%{_host_cpu} \
         --disable-static \
-	--with-freetype-lib=%_libdir \
+	--with-freetype-lib=%{_libdir} \
   	--with-x \
   	--enable-libxml2=no \
   	--with-confdir=%{_sysconfdir}/fonts \
   	--with-docdir=%{_defaultdocdir}/%{name} \
-  	--with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
+  	--with-add-fonts=%{_prefix}/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,%{_prefix}/local/share/fonts \
 	%if %{build_docs} == 0
   	--disable-docs
         %endif
@@ -138,7 +138,7 @@ unset MALLOC_CHECK_
 
 %install
 make DESTDIR=%{buildroot} pkgconfigdir=%{_libdir}/pkgconfig install
-rm -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 # package /etc/fonts/conf.avail for compatibility reasons
 mkdir %{buildroot}%{_sysconfdir}/fonts/conf.avail
 # documentation
@@ -191,7 +191,7 @@ popd
 %{_datadir}/%{name}/conf.avail/*.conf
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/fonts.dtd
-%dir /var/cache/fontconfig/
+%dir %{_localstatedir}/cache/fontconfig/
 %doc %{_docdir}/%{name}
 %{_mandir}/man5/fonts-conf.5.gz
 %{_mandir}/man1/*