diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index 2ee780cf573..b9c13a47c4e 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the wine runtime."
 
 only_for_archs=i686
-replaces="libwine>=0"
+replaces="libwine>=0 libwine-unstable>=1.4-rc4"
 provides="libwine-$version"
 conflicts="libwine>=0"
 
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index b7c9cdfe3c6..7df0ba00efb 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,12 +1,15 @@
 # Template file for 'wine-unstable'
 __pkgname=wine
 pkgname=${__pkgname}-unstable
-version=1.4-rc4
-wrksrc=${__pkgname}-$version
+__majminver=1.4
+__rcver=rc4
+__otherversion=${__magminver}-${__rcver}
+version=${__majminver}.${__rcver}
+wrksrc=${__pkgname}-${__otherversion}
 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"
+distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${__otherversion}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -18,7 +21,7 @@ long_desc="
 
 only_for_archs=i686
 build_requires=11
-replaces="wine>=0"
+replaces="wine>=0 wine-unstable>=1.4-rc4"
 provides="wine-$version"
 conflicts="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 456ca4b891a..e70d7a7cab9 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 only_for_archs=i686
-replaces="wine-devel>=0"
+replaces="wine-devel>=0 wine-unstable-devel>=1.4-rc4"
 provides="wine-devel-$version"
 conflicts="wine-devel>=0"