diff --git a/srcpkgs/wine/files/30-win32-aliases.conf b/srcpkgs/wine/files/30-win32-aliases.conf
new file mode 100644
index 00000000000..99ae1f7b83a
--- /dev/null
+++ b/srcpkgs/wine/files/30-win32-aliases.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="same">
+    <family>MS Shell Dlg</family>
+    <accept><family>Microsoft Sans Serif</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias binding="same">
+    <family>MS Shell Dlg 2</family>
+    <accept><family>Tahoma</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+
+  <alias binding="same">
+    <family>MS Sans Serif</family>
+    <prefer><family>Microsoft Sans Serif</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
+</fontconfig>
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 94631b13d32..7cb814ee3ed 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=1.7.22
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Run Microsoft Windows applications"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,6 @@ checksum=60374c94c64110d58939e716c3ef4916059c691a2953d8340a9a140a208a7c63
 lib32mode=full
 only_for_archs=i686
 
-# XXX OpenCL support
 hostmakedepends="pkg-config flex prelink"
 makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
@@ -23,7 +22,7 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
  libxslt-devel glib-devel gst-plugins-base-devel freetype-devel
  mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- cups-devel dbus-devel"
+ cups-devel dbus-devel ocl-icd-devel"
 
 makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 depends="libOSMesa>=0 desktop-file-utils>=0 hicolor-icon-theme>=0 liberation-fonts-ttf>=0"
@@ -33,6 +32,12 @@ pre_configure() {
 	# Otherwise, throws a nasty warning.
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }
+post_install() {
+	# Font aliasing settings for Win32 applications
+	install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
+	install -m644 ${FILESDIR}/30-win32-aliases.conf ${DESTDIR}/etc/fonts/conf.avail
+	ln -s ../conf.avail/30-win32-aliases.conf ${DESTDIR}/etc/fonts/conf.d/30-win32-aliases.conf
+}
 
 libwine_package() {
 	short_desc+=" - Runtime library"