diff --git a/fontconfig.spec b/fontconfig.spec
index ce5f82b..5e3e411 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,18 +3,21 @@
 Summary:	Font configuration and customization library
 Name:		fontconfig
 Version:	2.10.91
-Release:	2%{?dist}
+Release:	3%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 # fc-case/CaseFolding.txt is in the UCD
 # otherwise MIT
 License:	MIT and Public Domain and UCD
 Group:		System Environment/Libraries
-Source:		http://fontconfig.org/release/fontconfig-%{version}.tar.bz2
+Source:		http://fontconfig.org/release/%{name}-%{version}.tar.bz2
 URL:		http://fontconfig.org
 Source1:	25-no-bitmap-fedora.conf
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=140335
 Patch0:		fontconfig-2.8.0-sleep-less.patch
+# http://cgit.freedesktop.org/fontconfig/commit/?id=96220a5ed9d1d761b14a7ac516ac6786c132f280
+Patch1:		fontconfig-automake-1.13.patch
 
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= %{freetype_version}
@@ -33,7 +36,7 @@ applications.
 %package	devel
 Summary:	Font configuration and customization library
 Group:		Development/Libraries
-Requires:	fontconfig = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	freetype-devel >= %{freetype_version}
 Requires:	pkgconfig
 
@@ -44,14 +47,25 @@ and developer docs for the fontconfig package.
 Install fontconfig-devel if you want to develop programs which 
 will use fontconfig.
 
+%package	devel-doc
+Summary:	Development Documentation files for fontconfig library
+Group:		Documentation
+BuildArch:	noarch
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description	devel-doc
+The fontconfig-devel-doc package contains the documentation files
+which is useful for developing applications that uses fontconfig.
+
 %prep
 %setup -q
 %patch0 -p1 -b .sleep-less
+%patch1 -p1 -b .1-automake113
 
 %build
 # update autotools stuff to avoid rpath definition.
 libtoolize -f
-autoreconf -f
+autoreconf -f -i
 
 # We don't want to rebuild the docs, but we want to install the included ones.
 export HASDOCBOOK=no
@@ -108,23 +122,30 @@ fi
 %{_bindir}/fc-scan
 %{_bindir}/fc-validate
 %{_fontconfig_templatedir}/*.conf
-%dir %{_datadir}/xml/fontconfig
-%{_datadir}/xml/fontconfig/fonts.dtd
+%{_datadir}/xml/fontconfig
+# fonts.conf is not supposed to be modified.
+# If you want to do so, you should use local.conf instead.
 %config %{_fontconfig_masterdir}/fonts.conf
 %config(noreplace) %{_fontconfig_confdir}/*.conf
 %dir %{_localstatedir}/cache/fontconfig
-
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 %files devel
-%doc fontconfig-devel.txt fontconfig-devel
 %{_libdir}/libfontconfig.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/fontconfig
 %{_mandir}/man3/*
 
+%files devel-doc
+%doc fontconfig-devel.txt fontconfig-devel
+
 %changelog
+* Tue Feb 12 2013 Akira TAGOH <tagoh@redhat.com> - 2.10.91-3
+- Improve the spec to meet the latest packaging guidelines (#225759)
+  - add -devel-doc subpackage.
+- Fix a build issue with automake 1.13
+
 * Fri Feb  8 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.10.91-2
 - Own the %%{_datadir}/xml/fontconfig dir.
 - Fix bogus dates in %%changelog.