diff --git a/fonts-config b/fonts-config
index 7f4ac75..8d12369 100644
--- a/fonts-config
+++ b/fonts-config
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# Copyright (c) 2000-2013 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2000-2014 SuSE Linux AG, Nuernberg, Germany.
 # All rights reserved.
 ########################################################################
 # create a man-page with:
@@ -304,7 +304,7 @@ use Env;
 use strict;
 
 my $script_start_time = time();
-my $version = 20140226;
+my $version = 20140321;
 
 #
 #  OPTIONS
@@ -557,7 +557,7 @@ sub get_option_defaults_from_sysconfig {
       elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer
         eval("\$$sysconfig_options{$i}=\$$i");
       }
-      elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 ]+$/) { # Type string
+      elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 &]+$/) { # Type string
         eval("\$$sysconfig_options{$i}=\$$i");
       }
       else { # this case also occurs when the variable is the empty string!
@@ -1174,10 +1174,13 @@ sub family_preference_list {
     print "--- Prefered $family families: ";
   }
 
+  $family =~ s/&/&/g;
+
   $cfg .= "	<alias>\n";
   $cfg .= "		<family>$family</family>\n";
   $cfg .= "		<prefer>\n";
   for my $f (@families) {
+    $f =~ s/&/&amp;/g;
     $cfg .= "			<family>$f</family>\n";
     if ($VERBOSITY >= $VERBOSITY_DEBUG) {
       print "[$f] ";
diff --git a/fonts-config.changes b/fonts-config.changes
index 2644e9a..321dc2a 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Mar 21 09:33:50 UTC 2014 - pgajdos@suse.com
+
+- updated to 20140331:
+  * allow ampersand in string sysconfig variable
+  * xml-escape ampersand from <alias> family names
+  * added bitmap font example for PREFER_*_FAMILIES
+
+-------------------------------------------------------------------
+Thu Mar 20 15:45:20 UTC 2014 - pgajdos@suse.com
+
+- fix default values and use list of possibilities in sysconfig
+  file [bnc#869398] (internal)
+
 -------------------------------------------------------------------
 Fri Feb 28 07:34:57 UTC 2014 - pgajdos@suse.com
 
diff --git a/fonts-config.spec b/fonts-config.spec
index 5b434a7..1aeda6d 100644
--- a/fonts-config.spec
+++ b/fonts-config.spec
@@ -19,7 +19,7 @@
 %define infinality_srcver 1-20130104_1
 %define infinality_name    fontconfig-infinality
 Name:           fonts-config
-Version:        20140226
+Version:        20140321
 Release:        0
 Summary:        Configures Fonts for X Windows and other applications
 License:        GPL-2.0+ and MIT
diff --git a/sysconfig.fonts-config b/sysconfig.fonts-config
index ea7c274..a9a574d 100644
--- a/sysconfig.fonts-config
+++ b/sysconfig.fonts-config
@@ -1,7 +1,7 @@
 ## Path:        Desktop
 ## Description: Display font configuration
 ## Type:        integer
-## Default:     quiet
+## Default:     0
 #
 # Type of output (quiet=0, verbose=1, debug=256) while reconfiguring
 # fonts.
@@ -10,7 +10,7 @@ VERBOSITY="0"
 
 ## Path:        Desktop
 ## Description: Display font configuration
-## Type:        string
+## Type:        list(none,hintnone,hintslight,hintmedium,hintfull)
 ## Default:     none
 #
 #  Prefered common hinting style.
@@ -20,8 +20,6 @@ VERBOSITY="0"
 #  though, hinstyle can be overriden by other option in this file
 #  (e. g. FORCE_BW_MONOSPACE => hintfull)
 #
-#  Possible values: none, hintnone, hintslight, hintmedium, hintfull
-#
 FORCE_HINTSTYLE="none"
 
 ## Path:        Desktop
@@ -56,7 +54,7 @@ FORCE_BW_MONOSPACE="no"
 
 ## Path:        Desktop
 ## Description: Display font configuration
-## Type:        string
+## Type:        list(lcdnone,lcddefault,lcdlight,lcdlegacy)
 ## Default:     lcdnone
 #
 # LCD filter.
@@ -65,26 +63,17 @@ FORCE_BW_MONOSPACE="no"
 # when you want subpixel rendering. lcddefault seems to
 # be most used value here.
 #
-# Possible values: lcdnone, lcddefault, lcdlight, lcdlegacy
-#
 USE_LCDFILTER="lcdnone"
 
 ## Path:        Desktop
 ## Description: Display font configuration
-## Type:        string
-## Default:     lcdnone
+## Type:        list(none,rgb,vrgb,bgr,vbgr,unknown)
+## Default:     none
 #
 # Subpixel arrangement for your monitor and its rotation.
 #
-# Possible values: none, rgb, vrgb, bgr, vbgr, unknown
-#
 USE_RGBA="none"
 
-## Path:        Desktop
-## Description: Display font configuration
-## Type:        yesno
-## Default:     no
-
 ## Path:        Desktop
 ## Description: Display font configuration
 ## Type:        yesno
@@ -135,6 +124,10 @@ EMBEDDED_BITMAPS_LANGUAGES="ja:ko:zh-CN:zh-TW:zh-HK:zh-SG"
 #
 # PREFER_SANS_FAMILIES="Source Sans Pro:CMU Sans Serif:CMU Bright:Linux Biolinum O:Latin Modern Sans"
 #
+# Other example gives the preference to bitmap fonts for various scripts.
+# 
+# PREFER_SANS_FAMILIES="Adobe Helvetica:B&H Lucida:Efont Biwidth:Efont Fixed:Efont Fixed Wide:Arabic Newspaper:Gnu Unifont:WenQuanYi WenQuanYi Bitmap Song"
+#
 PREFER_SANS_FAMILIES=""
 
 ## Path:        Desktop
@@ -150,6 +143,10 @@ PREFER_SANS_FAMILIES=""
 #
 # PREFER_SERIF_FAMILIES="CMU Serif:CMU Serif Extra:Linux Libertine O:Crimson:Old Standard:Rachana:Latin Modern Roman:Latin Modern Roman"
 #
+# Other example gives the preference to bitmap fonts for various scripts.
+# 
+# PREFER_SERIF_FAMILIES="Adobe Times:Adobe New Century Schoolbook:Adobe Utopia:B&H LucidaBright:MUTT ClearlyU Wide:MUTT ClearlyU PUA:MUTT ClearlyU Alternate Glyphs Wide"
+#
 PREFER_SERIF_FAMILIES=""
 
 ## Path:        Desktop
@@ -165,12 +162,16 @@ PREFER_SERIF_FAMILIES=""
 #
 # PREFER_MONO_FAMILIES="Source Code Pro:CMU Typewriter Text:Linux Libertine Mono O:Tempora:Latin Modern Mono:Latin Modern Mono Light"
 #
+# Other example gives the preference to bitmap fonts for various scripts.
+#
+# PREFER_MONO_FAMILIES="Adobe Courier:B&H LucidaTypewriter:Efont Fixed:Efont Fixed Wide:Gnu Unifont Mono:Misc Fixed:Misc Fixed Wide:Schumacher Clean:xos4 Terminus:WenQuanYi WenQuanYi Bitmap Song"
+#
 PREFER_MONO_FAMILIES=""
 
 ## Path:        Desktop
 ## Description: Display font configuration
 ## Type:        yesno
-## Default:     no
+## Default:     yes
 #
 # Do not metric substitutions.
 #