diff --git a/fontconfig/31-cantarell.conf b/fontconfig/31-cantarell.conf
new file mode 100644
index 0000000..2b3ab09
--- /dev/null
+++ b/fontconfig/31-cantarell.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Generic name assignment -->
+  <match target="pattern">
+    <test qual="any" name="family">
+      <string>Cantarell</string>
+    </test>
+    <edit name="family" mode="assign" binding="weak">
+      <string>Cantarell</string>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fontconfig/57-cantarell.conf b/fontconfig/57-cantarell.conf
deleted file mode 100644
index 03efec1..0000000
--- a/fontconfig/57-cantarell.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!--
-
-     Define aliasing and other fontconfig settings for Cantarell.
-
--->
-<fontconfig>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>Cantarell</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Cantarell</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 335a682..a6fb360 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -1,6 +1,6 @@
 configdir = $(datadir)/fontconfig/conf.avail/
 config_DATA = \
-	57-cantarell.conf
+	31-cantarell.conf
 
 EXTRA_DIST = $(config_DATA)