diff --git a/lib/fontconfig/conf.d/31-nonmst.conf b/lib/fontconfig/conf.d/31-nonmst.conf
new file mode 100644
index 000000000..7ba69b349
--- /dev/null
+++ b/lib/fontconfig/conf.d/31-nonmst.conf
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<!--
+		$OpenBSD: 31-nonmst.conf,v 1.1 2009/02/27 23:12:11 matthieu Exp $
+		Replacement using Bitstream Vera fonts.
+	-->
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Times New Roman</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Times</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Arial</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Helvetica</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Courier</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans Mono</string>
+		</edit>
+	</match>
+
+</fontconfig>
+
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<!--
+		$OpenBSD: 31-nonmst.conf,v 1.1 2009/02/27 23:12:11 matthieu Exp $
+		Replacement using Liberation fonts.
+	-->
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Times New Roman</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Times</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Arial</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Helvetica</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>Courier</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>Bitstream Vera Sans Mono</string>
+		</edit>
+	</match>
+
+</fontconfig>
+
diff --git a/lib/fontconfig/conf.d/Makefile.am b/lib/fontconfig/conf.d/Makefile.am
index bad95a70e..9a8206221 100644
--- a/lib/fontconfig/conf.d/Makefile.am
+++ b/lib/fontconfig/conf.d/Makefile.am
@@ -35,6 +35,7 @@ CONF_FILES = \
 	20-unhint-small-vera.conf \
 	30-amt-aliases.conf \
 	30-urw-aliases.conf \
+	31-nonmst.conf \
 	40-generic.conf \
 	49-sansserif.conf \
 	50-user.conf \
@@ -55,6 +56,7 @@ CONF_LINKS = \
 	20-unhint-small-vera.conf \
 	30-amt-aliases.conf \
 	30-urw-aliases.conf \
+	31-nonmst.conf \
 	40-generic.conf \
 	49-sansserif.conf \
 	50-user.conf \
diff --git a/lib/fontconfig/conf.d/Makefile.in b/lib/fontconfig/conf.d/Makefile.in
index e0fea940c..e00b19bd0 100644
--- a/lib/fontconfig/conf.d/Makefile.in
+++ b/lib/fontconfig/conf.d/Makefile.in
@@ -243,6 +243,7 @@ CONF_FILES = \
 	20-unhint-small-vera.conf \
 	30-amt-aliases.conf \
 	30-urw-aliases.conf \
+	31-nonmst.conf \
 	40-generic.conf \
 	49-sansserif.conf \
 	50-user.conf \
@@ -263,6 +264,7 @@ CONF_LINKS = \
 	20-unhint-small-vera.conf \
 	30-amt-aliases.conf \
 	30-urw-aliases.conf \
+	31-nonmst.conf \
 	40-generic.conf \
 	49-sansserif.conf \
 	50-user.conf \