diff --git a/fonts-config b/fonts-config
index 8e6316e..1cb1e0b 100644
--- a/fonts-config
+++ b/fonts-config
@@ -322,7 +322,7 @@ use utf8;
 use English;
 use Getopt::Long;
 use File::Basename;
-use File::Path qw(make_path);
+use File::Path qw(mkpath);
 use Env;
 use strict;
 
@@ -1344,13 +1344,13 @@ sub family_metric_compatibility  {
         $suse_metric .= "\n";
       }
     }
+    close (CONF);
   } else {
       if ($VERBOSITY >= $VERBOSITY_DEBUG) {
         print "--- WARNING: $fontconfig_metric_conf doesn't exist!\n";
       }
   }
 
-  close (CONF);
   return $suse_metric;
 }
 
@@ -1378,23 +1378,31 @@ sub family_preference_config {
 
   if (!$user)
   {
-    # replace fontconfig's /etc/fonts/conf.d/30-metric-aliases.conf
-    # by fonts-config's one
+    if (-e $metric_avail) {
+      # replace fontconfig's /etc/fonts/conf.d/30-metric-aliases.conf
+      # by fonts-config's one
 
-    if (-l $metric_symlink) {
-      my_remove_symlink($metric_symlink);
+      if (-l $metric_symlink) {
+        my_remove_symlink($metric_symlink);
+      }
+
+      $suse_metric .= family_metric_compatibility($metric_avail, $user);
+
+      if ($VERBOSITY >= $VERBOSITY_DEBUG) {
+        print "--- writing $suse_metric_file ---\n";
+        print "---\n";
+      }
+      # same name as symlink from fontconfig
+      open (CONF, ">$suse_metric_file") || die "can't open file $suse_metric_file: $!";
+      print CONF $suse_metric;
+      close (CONF);
     }
-
-    $suse_metric .= family_metric_compatibility($metric_avail, $user);
-
-    if ($VERBOSITY >= $VERBOSITY_DEBUG) {
-      print "--- writing $suse_metric_file ---\n";
-      print "---\n";
+    else {
+      if ($VERBOSITY >= $VERBOSITY_DEBUG) {
+        print "--- WARNING: $metric_avail not found, not writing $suse_metric_file ---\n";
+        print "---\n";
+      }
     }
-    # same name as symlink from fontconfig
-    open (CONF, ">$suse_metric_file") || die "can't open file $suse_metric_file: $!";
-    print CONF $suse_metric;
-    close (CONF);
   }
 
   $suse_pref .= "<?xml version=\"1.0\"?>\n";
@@ -1922,7 +1930,7 @@ sub my_make_path {
     }
     return;
   }
-  make_path($dir);
+  mkpath($dir);
   if (! -d $dir) {
     if ($VERBOSITY >= $VERBOSITY_DEBUG) {
       print "can not create\n";
diff --git a/fonts-config.changes b/fonts-config.changes
index 12f73b1..8cb23cd 100644
--- a/fonts-config.changes
+++ b/fonts-config.changes
@@ -1,8 +1,17 @@
+-------------------------------------------------------------------
+Tue Apr 21 13:34:43 UTC 2015 - pgajdos@suse.com
+
+- updated to 20150421:
+  * use mkpath instead of make_path [bnc#927968]
+  * behave better when 
+    /usr/share/fontconfig/conf.avail/30-metric-aliases.conf
+    not found
+
 -------------------------------------------------------------------
 Fri Apr 17 11:55:10 UTC 2015 - pgajdos@suse.com
 
 - updated to 20150417:
-  added --user option
+  * added --user option
 
 -------------------------------------------------------------------
 Mon Jan 12 13:55:20 UTC 2015 - pgajdos@suse.com