diff --git a/11-base-rendering.conf b/11-base-rendering.conf
index 010699f..9f248ac 100644
--- a/11-base-rendering.conf
+++ b/11-base-rendering.conf
@@ -101,6 +101,12 @@
 
         <!-- font smooth or don't font smooth -->
 	<match target="font">
+                <!-- this test should not be needed, 
+                     as antialiasing is done only for outlines,
+                     but workarounds Qt5 issue, see bug 866705 -->
+		<test name="outline">
+			<bool>true</bool>
+		</test>
 		<edit name="antialias" mode="assign">
 			<bool>true</bool>
 		</edit>
diff --git a/fonts-config.changes b/fonts-config.changes
index 321dc2a..64b7ef0 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 15 14:13:16 UTC 2014 - pgajdos@suse.com
+
+- fix comment for SEARCH_METRIC_COMPATIBLE
+
+-------------------------------------------------------------------
+Wed May 14 16:40:42 CEST 2014 - tiwai@suse.de
+
+- Don't force antialias for bitmap fonts for avoiding the render
+  errors with Qt5 (bnc#866705)
+
 -------------------------------------------------------------------
 Fri Mar 21 09:33:50 UTC 2014 - pgajdos@suse.com
 
diff --git a/sysconfig.fonts-config b/sysconfig.fonts-config
index a9a574d..93fc549 100644
--- a/sysconfig.fonts-config
+++ b/sysconfig.fonts-config
@@ -173,7 +173,7 @@ PREFER_MONO_FAMILIES=""
 ## Type:        yesno
 ## Default:     yes
 #
-# Do not metric substitutions.
+# Perform metric substitutions.
 #
 # When set to yes, value of PREFER_*_FAMILIES can be overriden when document 
 # or GUI is requesting metric compatible font as defined