diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index 2ee780cf573..38238b05267 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the wine runtime."
 
+revision=1
+
 only_for_archs=i686
 replaces="libwine>=0"
 provides="libwine-$version"
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 756b5adda73..ad35d29249a 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -2,6 +2,7 @@
 __pkgname=wine
 pkgname=${__pkgname}-unstable
 version=1.3.35
+revision=1
 wrksrc=${__pkgname}-$version
 build_style=gnu-configure
 configure_args="--with-x"
@@ -33,6 +34,7 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run libwine-unstable
 Add_dependency run liberation-fonts-ttf # else stuff appears in hebrew
+Add_dependency run fontconfig
 
 Add_dependency build gettext-devel
 Add_dependency build flex
@@ -42,17 +44,33 @@ Add_dependency build MesaLib-devel
 Add_dependency build libSM-devel
 Add_dependency build libXext-devel
 Add_dependency build libX11-devel
+Add_dependency build libXpm-devel
+Add_dependency build libXinerama-devel
+Add_dependency build libXcomposite-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 libgphoto2-devel
 Add_dependency build libxml2-devel
+Add_dependency build libxslt-devel
 Add_dependency build glib-devel
 Add_dependency build gst-plugins-base-devel
 Add_dependency build freetype-devel
 Add_dependency build mpg123-devel
 Add_dependency build libgsm-devel
 Add_dependency build libopenal-devel
-Add_dependency build prelink
+Add_dependency build giflib-devel
+Add_dependency build libpng-devel
+Add_dependency build v4l-utils-devel
+Add_dependency build fontconfig-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
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 456ca4b891a..c3b6976b9e8 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 only_for_archs=i686
 replaces="wine-devel>=0"
 provides="wine-devel-$version"