diff --git a/srcpkgs/libwine b/srcpkgs/libwine
deleted file mode 120000
index bd42d64fa10..00000000000
--- a/srcpkgs/libwine
+++ /dev/null
@@ -1 +0,0 @@
-wine
\ No newline at end of file
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 717260c94c4..15769a8351d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.21
+version=9.0
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${_pkgver}/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="02d6493f348168268669b62d4795df5b335be9ae06229c68f388a093d0d6b61d
- 735d3072caa0ba0b528b837bd20e38b5d5f6008b055fff5295d37ea7cae66ce6"
+checksum="7cfd090a5395f5b76d95bb5defac8a312c8de4c070c1163b8b58da38330ca6ee
+ e3b4af34214a5c962056fc1b360d1f6fc0d33d97cd3ee6d3f9d8758c2cb7f58c"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine
@@ -52,11 +52,12 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+ gnutls SDL2 wine-common>=${version}_${revision}"
 lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0
  libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0
  liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0
- wine-common>=${version}_${revision} libwine-32bit>=${version}_${revision}"
+ wine-common>=${version}_${revision}"
+replaces="libwine>=0"
 # This testsuite might hang indefinitely
 make_check=extended
 
@@ -73,6 +74,11 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" --enable-archs=i386,x86_64"
+	makedepends+=" cross-i686-w64-mingw32"
+fi
+
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 
@@ -125,17 +131,7 @@ post_install() {
 	done
 }
 
-libwine_package() {
-	lib32mode=full
-	short_desc+=" - Runtime library"
-	replaces="libwine-unstable>=0"
-	pkg_install() {
-		vmove usr/lib/wine
-	}
-}
-
 wine-devel_package() {
-	depends="libwine-${version}_${revision}"
 	short_desc+=" - development files"
 	replaces="wine-unstable-devel>=0"
 	pkg_install() {