diff --git a/fonts-config.changes b/fonts-config.changes
index 9be9b34..e3bc039 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 11 09:53:01 UTC 2014 - pgajdos@suse.com
+
+- 10-rendering-options.conf and 58-family-prefer-local.conf are
+  generated in every fonts-config call and as such should not
+  be under /usr/share/fonts-config/conf.avail but under
+  /etc/fonts/conf.d/ [bnc#882029]
+
 -------------------------------------------------------------------
 Wed Jun  4 06:22:54 UTC 2014 - pgajdos@suse.com
 
diff --git a/fonts-config.spec b/fonts-config.spec
index 0b55cd4..85ac6d7 100644
--- a/fonts-config.spec
+++ b/fonts-config.spec
@@ -95,9 +95,16 @@ pod2man --section 1 --center=" " %{SOURCE0} > \
   %{buildroot}/%{_mandir}/man1/fonts-config.1
 #
 install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/%{name}
-mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/
-for conf in 	10-rendering-options.conf \
-		10-group-tt-hinted-fonts.conf \
+mkdir -p %{buildroot}%{_fontsconfavaildir}
+# following two conf files can not be under /usr/share/fonts-config
+# as they are changed during installation [bnc#882029 (internal)] 
+mkdir -p %{buildroot}%{_fontsconfddir}
+for conf in     10-rendering-options.conf \
+                58-family-prefer-local.conf; do
+  install -m 644 $conf %{buildroot}%{_fontsconfddir}
+done
+#
+for conf in 	10-group-tt-hinted-fonts.conf \
 		10-group-tt-non-hinted-fonts.conf \
 		11-base-rendering.conf \
 		12-tt-monospace-rendering.conf \
@@ -105,10 +112,9 @@ for conf in 	10-rendering-options.conf \
 		13-selective-rendering-ipa.conf \
                 31-metric-aliases-bw.conf \
 		49-family-default.conf \
-                58-family-prefer-local.conf \
 		60-family-prefer.conf \
 		61-wine-aliases.conf \
-		70-reject.conf; do \
+		70-reject.conf; do 
   install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/
   %link_avail_to_system_fontsconf $conf
 done
@@ -134,6 +140,6 @@ exit 0
 %{_docdir}/%{name}
 %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
 %{_fontsconfavaildir}/*.conf
-%{_fontsconfddir}/*.conf
+%config %{_fontsconfddir}/*.conf
 
 %changelog