diff --git a/srcpkgs/wine/libwine.rshlibs b/srcpkgs/wine/libwine.rshlibs
index 9bd38d18d68..f4fbb965b37 100644
--- a/srcpkgs/wine/libwine.rshlibs
+++ b/srcpkgs/wine/libwine.rshlibs
@@ -18,3 +18,9 @@ liblber-2.4.so.2
 libpthread.so.0
 libopenal.so.1
 liblcms.so.1
+libgstapp-0.10.so.0
+libgstreamer-0.10.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+libglib-2.0.so.0
diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template
index 713834220a6..8bcf2099903 100644
--- a/srcpkgs/wine/libwine.template
+++ b/srcpkgs/wine/libwine.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the wine runtime."
 
-revision=6
-
 only_for_archs=i686
 replaces="libwine>=0"
 
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 63cd15b304e..1b1eb83d22c 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,14 +1,14 @@
 # Template file for 'wine'
 pkgname=wine
-version=1.2.3
-revision=5
+version=1.4
 build_style=gnu-configure
+configure_args="--with-x"
 homepage="http://www.winehq.org/"
 distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
-checksum=3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f
+checksum=99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
  you can install and run these applications just like you would in
@@ -19,42 +19,58 @@ replaces="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
+# XXX OpenCL
+# XXX libsane (scanner support)
+# XXX libcups (printing support)
+# XXX libcapi20 (ISDN support)
+
 
 Add_dependency build flex
+Add_dependency build gettext-devel
 Add_dependency build lcms-devel
 Add_dependency build zlib-devel
+Add_dependency build ncurses-devel
 Add_dependency build MesaLib-devel
 Add_dependency build libSM-devel
 Add_dependency build libXext-devel
 Add_dependency build libX11-devel
-Add_dependency build libXcursor-devel
-Add_dependency build libXrandr-devel
+Add_dependency build libXpm-devel
 Add_dependency build libXinerama-devel
 Add_dependency build libXcomposite-devel
-Add_dependency build libXrender-devel
+Add_dependency build libXmu-devel
+Add_dependency build libXxf86vm-devel
+Add_dependency build libXcursor-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libXdamage-devel
 Add_dependency build libXi-devel
 Add_dependency build libldap-devel
 Add_dependency build alsa-lib-devel
-Add_dependency build libgsm-devel
 Add_dependency build libgphoto2-devel
 Add_dependency build libxml2-devel
 Add_dependency build libxslt-devel
-Add_dependency build libpng-devel
-Add_dependency build mpg123-devel
-Add_dependency build libopenal-devel
+Add_dependency build glib-devel
+Add_dependency build gst-plugins-base-devel
 Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
+Add_dependency build mpg123-devel
+Add_dependency build libgsm-devel
+Add_dependency build libopenal-devel
+Add_dependency build giflib-devel
+Add_dependency build libpng-devel
 Add_dependency build v4l-utils-devel
+Add_dependency build fontconfig-devel
 Add_dependency build gnutls-devel
+Add_dependency build dbus-devel
+
+
+Add_dependency build prelink	# WINE only needs it to build the DLLs,
+				# Otherwise, throws a nasty warning.
 
 Add_dependency full desktop-file-utils
 Add_dependency full hicolor-icon-theme
-
-CPPFLAGS="-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+Add_dependency full liberation-fonts-ttf # else stuff appears in hebrew
+Add_dependency full fontconfig
 
 pre_configure()
 {
 	sed -i 's/\(libncurses\)/\1w/g' configure
-	sed -i 's/\(libdbus\)/\1-1/g' configure
 }
-
diff --git a/srcpkgs/wine/wine-devel.template b/srcpkgs/wine/wine-devel.template
index e54692b2527..73024f7ec9b 100644
--- a/srcpkgs/wine/wine-devel.template
+++ b/srcpkgs/wine/wine-devel.template
@@ -8,8 +8,6 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run libwine
 
-revision=2
-
 only_for_archs=i686
 replaces="wine-unstable-devel>=0"
 provides="wine-devel-$version"
diff --git a/srcpkgs/wine/wine.rshlibs b/srcpkgs/wine/wine.rshlibs
index 5a89a864101..a8e8360750b 100644
--- a/srcpkgs/wine/wine.rshlibs
+++ b/srcpkgs/wine/wine.rshlibs
@@ -1,3 +1,4 @@
 libc.so.6
 libwine.so.1
 libpthread.so.0
+libgettextpo.so.0