diff --git a/cantarell-fontconfig.conf b/31-cantarell-vf.conf
similarity index 88%
rename from cantarell-fontconfig.conf
rename to 31-cantarell-vf.conf
index db6ad8b..bbc8600 100644
--- a/cantarell-fontconfig.conf
+++ b/31-cantarell-vf.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
 <!--
 
      Define aliasing and other fontconfig settings for Cantarell.
diff --git a/31-cantarell.conf b/31-cantarell.conf
new file mode 100644
index 0000000..bbc8600
--- /dev/null
+++ b/31-cantarell.conf
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Font substitution -->
+  <alias binding="same">
+    <family>system-ui</family>
+    <accept>
+      <family>Cantarell</family>
+    </accept>
+  </alias>
+
+  <!-- Generic name assignment -->
+  <alias>
+    <family>Cantarell</family>
+    <default>
+      <family>system-ui</family>
+    </default>
+  </alias>
+
+</fontconfig>