diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template
index 8bcf2099903..d96e50bee6d 100644
--- a/srcpkgs/wine/libwine.template
+++ b/srcpkgs/wine/libwine.template
@@ -5,11 +5,9 @@ long_desc="${long_desc}
 
  This package contains the wine runtime."
 
-only_for_archs=i686
 replaces="libwine>=0"
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 	vmove usr/lib/wine usr/lib
 }
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 6ab29448d55..18b85779929 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,16 +1,14 @@
 # Template file for 'wine'
 pkgname=wine
 version=1.4.1
+revision=2
 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"
-makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel MesaLib-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel libldap-devel alsa-lib-devel libgphoto2-devel libxml2-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 prelink"
-fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
-revision=1
-short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X."
+short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
+homepage="http://www.winehq.org/"
+distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856
 long_desc="
  Wine lets you run Windows software on other operating systems. With Wine,
@@ -19,19 +17,23 @@ long_desc="
 
 only_for_archs=i686
 replaces="wine>=0"
-subpackages="lib$pkgname $pkgname-devel"
-
+subpackages="libwine wine-devel"
 
 # XXX OpenCL
 # XXX libcapi20 (ISDN support)
+makedepends="flex gettext-devel lcms-devel zlib-devel ncurses-devel
+ glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
+ libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
+ libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel
+ libldap-devel alsa-lib-devel libgphoto2-devel libxml2-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 prelink"
 
+fulldepends="desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
 
-
-
-				# Otherwise, throws a nasty warning.
-
-
-pre_configure()
-{
+# Otherwise, throws a nasty warning.
+pre_configure() {
 	sed -i 's/\(libncurses\)/\1w/g' configure
 }
diff --git a/srcpkgs/wine/wine-devel.template b/srcpkgs/wine/wine-devel.template
index a2092bf48ee..48a3994034f 100644
--- a/srcpkgs/wine/wine-devel.template
+++ b/srcpkgs/wine/wine-devel.template
@@ -1,18 +1,14 @@
 # Template file for 'wine-devel'.
 #
-depends="glibc-devel libwine"
+depends="libwine-${version}_${revision}"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-only_for_archs=i686
 replaces="wine-unstable-devel>=0"
-provides="wine-devel-$version"
 conflicts="wine-unstable-devel>=0"
 
-do_install()
-{
+do_install() {
         vmove usr/include usr
 }