diff --git a/wine/.footprint b/wine/.footprint
index 49b4768d6..100c62ba5 100644
--- a/wine/.footprint
+++ b/wine/.footprint
@@ -241,6 +241,7 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/devicetopology.idl
 -rw-r--r--	root/root	usr/include/wine/windows/devpkey.h
 -rw-r--r--	root/root	usr/include/wine/windows/devpropdef.h
+-rw-r--r--	root/root	usr/include/wine/windows/difxapi.h
 -rw-r--r--	root/root	usr/include/wine/windows/digitalv.h
 -rw-r--r--	root/root	usr/include/wine/windows/dimm.h
 -rw-r--r--	root/root	usr/include/wine/windows/dimm.idl
@@ -631,6 +632,10 @@ drwxr-xr-x	root/root	usr/include/wine/windows/ddk/
 -rw-r--r--	root/root	usr/include/wine/windows/transact.h
 -rw-r--r--	root/root	usr/include/wine/windows/transact.idl
 -rw-r--r--	root/root	usr/include/wine/windows/twain.h
+-rw-r--r--	root/root	usr/include/wine/windows/txcoord.h
+-rw-r--r--	root/root	usr/include/wine/windows/txcoord.idl
+-rw-r--r--	root/root	usr/include/wine/windows/txdtc.h
+-rw-r--r--	root/root	usr/include/wine/windows/txdtc.idl
 -rw-r--r--	root/root	usr/include/wine/windows/udpmib.h
 -rw-r--r--	root/root	usr/include/wine/windows/uiautomation.h
 -rw-r--r--	root/root	usr/include/wine/windows/uiautomationclient.h
@@ -758,6 +763,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/advapi32.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/advpack.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/amstream.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
@@ -865,6 +871,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/ddrawex.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/devenum.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dhcpcsvc.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/difxapi.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput8.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dispex.dll.so
@@ -907,6 +914,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/advapi32.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/advpack.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/amstream.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
@@ -1014,6 +1022,7 @@ drwxr-xr-x	root/root	usr/lib/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/ddrawex.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/devenum.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dhcpcsvc.dll
+-rw-r--r--	root/root	usr/lib/wine/fakedlls/difxapi.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dinput.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dinput8.dll
 -rw-r--r--	root/root	usr/lib/wine/fakedlls/dispex.dll
@@ -1849,6 +1858,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/advapi32.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/advpack.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/amstream.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
@@ -1963,6 +1973,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/
 -rwxr-xr-x	root/root	usr/lib32/wine/ddrawex.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/devenum.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dhcpcsvc.dll.so
+-rwxr-xr-x	root/root	usr/lib32/wine/difxapi.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dinput.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dinput8.dll.so
 -rwxr-xr-x	root/root	usr/lib32/wine/dispdib.dll16.so
@@ -2007,6 +2018,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/advapi32.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/advpack.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/amstream.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
@@ -2121,6 +2133,7 @@ drwxr-xr-x	root/root	usr/lib32/wine/fakedlls/
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/ddrawex.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/devenum.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dhcpcsvc.dll
+-rw-r--r--	root/root	usr/lib32/wine/fakedlls/difxapi.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dinput.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dinput8.dll
 -rw-r--r--	root/root	usr/lib32/wine/fakedlls/dispdib.dll16
@@ -3141,8 +3154,8 @@ drwxr-xr-x	root/root	usr/share/wine/fonts/
 -rw-r--r--	root/root	usr/share/wine/fonts/vgasyst.fon
 -rw-r--r--	root/root	usr/share/wine/fonts/wingding.ttf
 drwxr-xr-x	root/root	usr/share/wine/gecko/
--rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-1.9-x86.msi
--rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-1.9-x86_64.msi
+-rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.21-x86.msi
+-rwxr-xr-x	root/root	usr/share/wine/gecko/wine_gecko-2.21-x86_64.msi
 -rw-r--r--	root/root	usr/share/wine/generic.ppd
 -rw-r--r--	root/root	usr/share/wine/l_intl.nls
 drwxr-xr-x	root/root	usr/share/wine/mono/
diff --git a/wine/.md5sum b/wine/.md5sum
index 912d9e5d0..f9ac13e0c 100644
--- a/wine/.md5sum
+++ b/wine/.md5sum
@@ -1,5 +1,4 @@
-78cd1a36f11f3371a45a910a999b2e37  libwine-install.patch
-be776eb7b50c15bac5543775c8416217  wine-1.5.30.tar.bz2
+2c1fa996b248362ba53bddb69237c688  wine-1.6-rc1.tar.bz2
 a79eb547bcb562aea5c7096bc97fff11  wine-mono-0.0.8.msi
-54a6418e2469fad5c4374a35ea54cf1a  wine_gecko-1.9-x86.msi
-9f870bef3aa17b3de06c8d36be5508f2  wine_gecko-1.9-x86_64.msi
+432eb3a2d05c3f07df67864f53c87c60  wine_gecko-2.21-x86.msi
+580bbabde1ec99ba9caa439c2dbca3f6  wine_gecko-2.21-x86_64.msi
diff --git a/wine/Pkgfile b/wine/Pkgfile
index 11c4a756c..e2fba636a 100644
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@@ -5,20 +5,16 @@
 # Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-32 prelink
 
 name=wine
-version=1.5.30
+version=1.6-rc1
 release=1
 source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
-	http://downloads.sourceforge.net/wine/wine_gecko-1.9-x86.msi
-	http://downloads.sourceforge.net/wine/wine_gecko-1.9-x86_64.msi
-	http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi
-	libwine-install.patch)
+	http://downloads.sourceforge.net/wine/wine_gecko-2.21-x86.msi
+	http://downloads.sourceforge.net/wine/wine_gecko-2.21-x86_64.msi
+	http://downloads.sourceforge.net/wine/wine-mono-0.0.8.msi)
 
 build() {
 	install -d wine32 wine64
 
-	# http://bugs.winehq.org/show_bug.cgi?id=33560
-	patch -d $name-$version -p 1 -i $SRC/libwine-install.patch
-
 	cd wine64
 
 	../$name-$version/configure \
@@ -54,8 +50,8 @@ build() {
 	install -d $PKG/usr/share/wine/mono
 
 	install -t $PKG/usr/share/wine/gecko/ \
-		$SRC/wine_gecko-1.9-x86.msi \
-		$SRC/wine_gecko-1.9-x86_64.msi
+		$SRC/wine_gecko-2.21-x86.msi \
+		$SRC/wine_gecko-2.21-x86_64.msi
 
 	install $SRC/wine-mono-0.0.8.msi $PKG/usr/share/wine/mono/