diff --git a/16-suse-hintstyle.conf b/16-suse-hintstyle.conf
index 2b907c1..8850bc4 100644
--- a/16-suse-hintstyle.conf
+++ b/16-suse-hintstyle.conf
@@ -31,78 +31,6 @@ exceptions will follow
exceptions:
-->
-
-
-
-
- Liberation Sans
-
-
- hintslight
-
-
-
-
-
- DejaVu Sans
-
-
- hintslight
-
-
-
-
-
- Droid Sans
-
-
- hintslight
-
-
-
-
-
- Liberation Serif
-
-
- hintslight
-
-
-
-
-
- DejaVu Serif
-
-
- hintslight
-
-
-
-
-
- Droid Serif
-
-
- hintslight
-
-
-
diff --git a/conf.d-readme-templatedir.patch b/conf.d-readme-templatedir.patch
new file mode 100644
index 0000000..1cfe640
--- /dev/null
+++ b/conf.d-readme-templatedir.patch
@@ -0,0 +1,42 @@
+Index: fontconfig-2.10.92/conf.d/Makefile.am
+===================================================================
+--- fontconfig-2.10.92.orig/conf.d/Makefile.am
++++ fontconfig-2.10.92/conf.d/Makefile.am
+@@ -78,6 +78,9 @@ template_DATA = \
+ 80-delicious.conf \
+ 90-synthetic.conf
+
++README: $(srcdir)/README.in
++ sed "s|\@TEMPLATEDIR\@|$(templatedir)|" <$(srcdir)/README.in >README
++
+ install-data-hook:
+ mkdir -p $(DESTDIR)$(configdir)
+ @(echo cd $(DESTDIR)$(configdir); \
+Index: fontconfig-2.10.92/conf.d/README.in
+===================================================================
+--- /dev/null
++++ fontconfig-2.10.92/conf.d/README.in
+@@ -0,0 +1,23 @@
++conf.d/README
++
++Each file in this directory is a fontconfig configuration file. Fontconfig
++scans this directory, loading all files of the form [0-9][0-9]*.conf.
++These files are normally installed in @TEMPLATEDIR@
++and then symlinked here, allowing them to be easily installed and then
++enabled/disabled by adjusting the symlinks.
++
++The files are loaded in numeric order, the structure of the configuration
++has led to the following conventions in usage:
++
++ Files begining with: Contain:
++
++ 00 through 09 Font directories
++ 10 through 19 system rendering defaults (AA, etc)
++ 20 through 29 font rendering options
++ 30 through 39 family substitution
++ 40 through 49 generic identification, map family->generic
++ 50 through 59 alternate config file loading
++ 60 through 69 generic aliases, map generic->family
++ 70 through 79 select font (adjust which fonts are available)
++ 80 through 89 match target="scan" (modify scanned patterns)
++ 90 through 99 font synthesis
diff --git a/fontconfig.changes b/fontconfig.changes
index 9cd1773..0735012 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Apr 11 10:24:57 UTC 2013 - pgajdos@suse.com
+
+- dropped metric-arial-narrow.patch (upstreamed)
+- dropped metric-croscore.patch (upstreamed)
+- /etc/conf.d/55-local.conf
+- tag /etc/fonts/conf.d/*.conf files as %config, not
+ %config(noreplace)
+- /etc/fonts/conf.d/README now mentions correct template dir
+ [bnc#810034]
+ * conf.d-readme-templatedir.patch
+- revert the change from Mon May 28 11:53:08 UTC 2012 because
+ hintslight implies autohinter. Rather render Liberation, DejaVu
+ and Droid sans serif and serif fonts with BCI, even if it means
+ thin (sometimes too much, see Liberation Sans 'R') glyphs. It
+ should be readable (less blurred). I'll add fontconfig hinting
+ profile in near future which will force autohinter for those
+ which like more thick fonts even if sometimes more blurred.
+
-------------------------------------------------------------------
Fri Apr 5 15:32:01 UTC 2013 - hrvoje.senjan@gmail.com
diff --git a/fontconfig.spec b/fontconfig.spec
index e890f2a..411234a 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -74,10 +74,8 @@ Source58: 58-suse-post-user.conf
Patch0: make-check.patch
# suse specific
Patch1: usr-share-doc-packages.patch
-# to be upstreamed https://bugs.freedesktop.org/show_bug.cgi?id=47721
-Patch3: metric-croscore.patch
-# to be upstreamed https://bugs.freedesktop.org/show_bug.cgi?id=60783
-Patch4: metric-arial-narrow.patch
+# to be upstreamed
+Patch2: conf.d-readme-templatedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
@@ -122,8 +120,7 @@ accepts font patterns and returns the nearest matching font.
%endif
%patch0 -p1
%patch1 -p1
-%patch3
-%patch4
+%patch2 -p1
%build
# ----- build with automake 1.13
@@ -179,8 +176,8 @@ install -m 644 conf.d/README %{buildroot}%{_sysconfdir}/fonts/conf.d
# tune links in conf.d
pushd %{buildroot}%{_sysconfdir}/fonts/conf.d
mv 50-user.conf 56-user.conf
- mv 51-local.conf 55-local.conf
- rm -f 51-local.conf
+ rm 51-local.conf
+ ln -s ../local.conf 55-local.conf
popd
for i in $RPM_SOURCE_DIR/[0-9]*.conf; do
j=${i##*/}
@@ -203,7 +200,7 @@ install -m 644 $RPM_SOURCE_DIR/local.conf.instsys %{buildroot}%{_sysconfdir}/fon
# packaging /etc/fonts/conf.avail for compatibility reasons
%dir %{_sysconfdir}/fonts/conf.avail
%config %{_sysconfdir}/fonts/fonts.conf
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
+%config %{_sysconfdir}/fonts/conf.d/*.conf
%config(noreplace) %{_sysconfdir}/fonts/local.conf
%config %{_sysconfdir}/fonts/local.conf.instsys
%{_sysconfdir}/fonts/conf.d/README
diff --git a/metric-arial-narrow.patch b/metric-arial-narrow.patch
deleted file mode 100644
index 4d64690..0000000
--- a/metric-arial-narrow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: conf.d/30-metric-aliases.conf
-===================================================================
---- conf.d/30-metric-aliases.conf
-+++ conf.d/30-metric-aliases.conf
-@@ -296,5 +296,15 @@
-
-
-
-+
-
-+
-+ Arial Narrow
-+ Liberation Sans Narrow
-+
-+
-+
-+ Liberation Sans Narrow
-+ Arial Narrow
-+
-
diff --git a/metric-croscore.patch b/metric-croscore.patch
deleted file mode 100644
index 81add9c..0000000
--- a/metric-croscore.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: conf.d/30-metric-aliases.conf
-===================================================================
---- conf.d/30-metric-aliases.conf
-+++ conf.d/30-metric-aliases.conf
-@@ -23,6 +23,10 @@
- Liberation Sans Narrow
- Liberation Serif
- Liberation Mono
-+ Croscore fonts;
-+ Arimo
-+ Tinos
-+ Cousine
- StarOffice fonts:
- Albany
- Thorndale
-@@ -102,6 +106,13 @@
-
-
-
-+ Arimo
-+
-+ Arial
-+
-+
-+
-+
- Albany
-
- Arial
-@@ -130,6 +141,13 @@
-
-
-
-+ Tinos
-+
-+ Times New Roman
-+
-+
-+
-+
- Thorndale
-
- Times New Roman
-@@ -155,6 +173,13 @@
-
- Courier New
-
-+
-+
-+
-+ Cousine
-+
-+ Courier New
-+
-
-
-