diff --git a/wine-1.1.28.tar.bz2 b/wine-1.1.28.tar.bz2
deleted file mode 100644
index 36389a0..0000000
--- a/wine-1.1.28.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9eb5682512c7640668aaba7665b6865930a2c9953f0165cb8e1eba4dbed9cd32
-size 15691625
diff --git a/wine-1.1.30.tar.bz2 b/wine-1.1.30.tar.bz2
new file mode 100644
index 0000000..cd74077
--- /dev/null
+++ b/wine-1.1.30.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8de454ff0433f033e0abb183b321dc9a0cd530dd3dde9e374339ef091222f419
+size 15837751
diff --git a/wine.changes b/wine.changes
index 550834d..fb889a8 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Sep 25 22:55:12 CEST 2009 - meissner@suse.de
+
+- Updated to 1.1.30
+  - Support for OpenAL.
+  - Many improvements in HTML and JavaScript support.
+  - Many common controls fixes and improvements.
+  - More Direct3D 10 work.
+  - Better MAPI support.
+  - Various bug fixes.
+- updated winetricks
+
+-------------------------------------------------------------------
+Fri Sep  4 14:19:52 CEST 2009 - meissner@suse.de
+
+- Updated to 1.1.29
+  - Improved Gecko integration by using Wine's network layers.
+  - Use of external libmpg123 for mp3 decoding.
+  - Support for JPEG and PNG formats in WindowsCodecs.
+  - Many regression test fixes for Win64 and Windows 7.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Fri Aug 21 19:11:09 CEST 2009 - meissner@suse.de
 
diff --git a/wine.spec b/wine.spec
index 0c67ff0..c1793c3 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package wine (Version 1.1.28)
+# spec file for package wine (Version 1.1.30)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,10 @@
 
 Name:           wine
 BuildRequires:  alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Group:          System/Emulators/PC
 AutoReqProv:    on
-Version:        1.1.28
+Version:        1.1.30
 Release:        1
 Summary:        An MS Windows Emulator
 Url:            http://www.winehq.com
@@ -52,7 +52,7 @@ running 'winecfg'.
 
 
 %package devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        files for wine development
 Group:          System/Emulators/PC
 
@@ -67,9 +67,6 @@ libraries.
 #
 cp %{S:3} .
 #
-test -d dlls/winemp3.acm && (
- 	echo "*** Must not include MP3 decoder!" ; exit 1
-)
 
 %build
 cat VERSION
diff --git a/winetricks b/winetricks
index 3ac9cb5..d7dc04d 100644
--- a/winetricks
+++ b/winetricks
@@ -19,7 +19,7 @@
 #---- Constants -------------------------------------------------
 
 # Name of this version of winetricks (YYYYMMDD)
-VERSION=20090815
+VERSION=20090913 
 
 # Default values for important settings if not already in environment.
 # These settings should not need editing here.
@@ -64,8 +64,10 @@ detectDE() {
 }
 
 warn() {
-    # Show errors both as GUI dialog and on stdout, for emphasis
     echo "$@"
+
+    test "$GUI" = 1 || return
+
     case $DE in
     gnome) zenity --error --title=Winetricks --text="$@" --no-wrap ;;
     kde) kdialog --title Winetricks --error "$@" ;;
@@ -112,11 +114,13 @@ usage() {
     echo " -V         display Version"
     echo "Packages:"
     echo " art2kmin      MS Access 2000 runtime.  Requires Access 2000 Dev license!"
+    echo " atmlib        Adobe Type Manager. Needed for Adobe CS4"
     echo " colorprofile  Standard RGB color profile"
     echo " comctl32      MS common controls 5.80"
     echo " comctl32.ocx  MS comctl32.ocx and mscomctl.ocx, comctl32 wrappers for VB6"
     echo " controlpad    MS ActiveX Control Pad"
     echo " corefonts     MS Arial, Courier, Times fonts"
+    echo " cygwin        Unix apps for Windows (needed by some build scripts)"
     echo " d3dx9         MS d3dx9_??.dll (from DirectX 9 user redistributable)"
     echo " dcom98        MS DCOM (ole32, oleaut32); requires Win98 license!"
     echo " dinput8       MS dinput8.dll (from DirectX 9 user redistributable)"
@@ -126,7 +130,7 @@ usage() {
     echo " divx          divx video codec"
     echo " dotnet11      MS .NET 1.1 (requires Windows license)"
     echo " dotnet20      MS .NET 2.0 (requires Windows license)"
-    echo " dotnet30      MS .NET 3.0 (requires Windows license)"
+    echo " dotnet30      MS .NET 3.0 (requires Windows license, does not work yet)"
     echo " droid         Droid fonts (on LCD, looks better with fontsmooth-rgb)"
     echo " ffdshow       ffdshow video codecs"
     echo " flash         Adobe Flash Player ActiveX and firefox plugins"
@@ -150,6 +154,7 @@ usage() {
     echo " mfc42         MS mfc42 (same as vcrun6 below)"
     echo " mono20        mono-2.0.1"
     echo " mono22        mono-2.2"
+    echo " mono24        mono-2.4"
     echo " msi2          MS Installer 2.0"
     echo " mshflxgd      MS Hierarchical Flex Grid Control"
     echo " msls31        MS Line Services 3.1 (needed by native riched?)"
@@ -162,6 +167,10 @@ usage() {
     echo " ole2          MS 16 bit OLE"
     echo " openwatcom    Open Watcom C/C++ compiler (can compile win16 code!)"
     echo " pdh           MS pdh.dll (Performance Data Helper)"
+    echo " psdk2003      MS Platform SDK 2003 (crashes at end, but seems to work)"
+    echo " psdkvista     MS Vista SDK (does not install yet)"
+    echo " psdkwin7      MS Windows 7 SDK (does not install yet)"
+    echo " python26      Python 2.6.2 (and pywin32)"
     echo " quicktime72   Apple Quicktime 7.2"
     echo " riched20      MS riched20 and riched32"
     echo " riched30      MS riched30"
@@ -173,13 +182,13 @@ usage() {
     echo " vb4run        MS Visual Basic 4 runtime"
     echo " vb5run        MS Visual Basic 5 runtime"
     echo " vb6run        MS Visual Basic 6 runtime"
+    echo " vc2005trial   MS Visual C++ 2005 Trial"
+    echo " vc2005express MS Visual C++ 2005 Express"
     echo " vcrun6        MS Visual C++ 6 sp4 libraries (mfc42, msvcp60, msvcrt)"
     echo " vcrun2003     MS Visual C++ 2003 libraries (mfc71,msvcp71,msvcr71)"
-    echo " vcrun2005     MS Visual C++ 2005 libraries (mfc80,msvcp80,msvcr80)"
-    echo " vcrun2005sp1  MS Visual C++ 2005 sp1 libraries"
+    echo " vcrun2005     MS Visual C++ 2005 sp1 libraries (mfc80,msvcp80,msvcr80)"
     echo " vcrun2008     MS Visual C++ 2008 libraries (mfc90,msvcp90,msvcr90)"
-    echo " vcrun2008sp1  MS Visual C++ 2008 sp1 libraries"
-    echo " vjrun20       MS Visual J# 2.0 libraries (requires dotnet20)"
+    echo " vjrun20       MS Visual J# 2.0 SE libraries (requires dotnet20)"
     echo " wininet       MS wininet.dll (requires Windows license)"
     echo " wme9          MS Windows Media Encoder 9 (requires Windows license)"
     echo " wmp9          MS Windows Media Player 9 (requires Windows license)"
@@ -460,11 +469,11 @@ _EOF_
 
 #----- common download for several verbs
 helper_directx_dl() {
-    # Mar 2009 DirectX 9c User Redistributable
-    # http://www.microsoft.com/downloads/details.aspx?FamilyID=0cf368e5-5ce1-4032-a207-c693d210f616&displaylang=en
-    download . http://download.microsoft.com/download/3/C/4/3C46A69A-CB0F-4CCA-B1E8-248D43270D5F/directx_mar2009_redist.exe 29957ee0d29b95019b082a47da5eab52f50cde0d
+    # Aug 2009 DirectX 9c User Redistributable
+    # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=04ac064b-00d1-474e-b7b1-442d8712d553
+    download . http://download.microsoft.com/download/B/7/9/B79FC9D7-47B8-48B7-A75E-101DEBEB5AB4/directx_aug2009_redist.exe 563b96a3d78d6038d10428f23954f083320b4019
 
-    DIRECTX_NAME=directx_mar2009_redist.exe
+    DIRECTX_NAME=directx_aug2009_redist.exe
 }
 
 #----- One function per package, in alphabetical order ----------
@@ -480,6 +489,19 @@ load_art2kmin() {
 
 #----------------------------------------------------------------
 
+load_atmlib() {
+    # http://www.microsoft.com/downloads/details.aspx?FamilyID=1001AAF1-749F-49F4-8010-297BD6CA33A0&displaylang=en
+    # FIXME: This is a huge download for a single dll.
+    download . http://download.microsoft.com/download/E/6/A/E6A04295-D2A8-40D0-A0C5-241BFECD095E/W2KSP4_EN.EXE fadea6d94a014b039839fecc6e6a11c20afa4fa8
+    cd "$WINETRICKS_TMP"
+    try cabextract "$WINETRICKS_CACHE"/W2KSP4_EN.EXE i386/atmlib.dl_
+    try cp atmlib.dll "$WINDIR"/system32
+    try rm -rf i386
+    cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
 load_autohotkey() {
     download . http://www.autohotkey.net/programs/AutoHotkey104803_Install.exe 5cf0f16e9aa2f2e96a3b08e0d938602aff39a33e
     try $WINE "$WINETRICKS_CACHE"/AutoHotkey104803_Install.exe $WINETRICKS_S
@@ -629,6 +651,17 @@ load_corefonts() {
 
 #----------------------------------------------------------------
 
+load_cygwin() {
+    download cygwin http://cygwin.com/setup.exe 5cfb8ebe4f385b0fcffa04d22d607ec75ea05180
+    mkdir "$WINEPREFIX"/drive_c/cygpkgs
+    test -f  "$WINEPREFIX"/drive_c/cygpkgs/setup.exe || cp "$WINETRICKS_CACHE/cygwin/setup.exe" "$WINEPREFIX"/drive_c/cygpkgs
+    cd "$WINEPREFIX"/drive_c/cygpkgs
+    try $WINE setup.exe
+    cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
 load_d3dx9() {
     helper_directx_dl
 
@@ -642,7 +675,7 @@ load_d3dx9() {
     # For now, not needed, but when Wine starts preferring our builtin dll over native it will be.
     override_dlls native d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30
     override_dlls native d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37
-    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41
+    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42
 }
 
 #----------------------------------------------------------------
@@ -705,7 +738,7 @@ load_directx9() {
     # We should probably remove most of these...?
     override_dlls native d3dim d3drm d3dx8 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29
     override_dlls native d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37
-    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dxof
+    override_dlls native d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dxof
     override_dlls native dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle
     override_dlls native dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby
     override_dlls native dswave dxdiagn mscoree msdmo qcap quartz streamci
@@ -798,6 +831,13 @@ load_dotnet11() {
 #----------------------------------------------------------------
 
 load_dotnet20() {
+    # If this is just a dependency check, don't re-install
+    if test $PACKAGE != dotnet20 && test -f "$WINDIR"/system32/l_intl.nls
+    then
+        echo "prerequisite dotnet20 already installed, skipping"
+        return
+    fi
+
     # Recipe from http://bugs.winehq.org/show_bug.cgi?id=10467#c57
     test -d "$WINDIR/gecko" || test -d "$WINDIR/system32/gecko" || load_gecko
     set_winver win2k
@@ -1415,7 +1455,6 @@ _EOF_
 load_mono22() {
     # Load Mono, have it handle all .net requests
     download .  ftp://ftp.novell.com/pub/mono/archive/2.2/windows-installer/5/mono-2.2-gtksharp-2.12.7-win32-5.exe be977dfa9c49deea1be02ba4a2228e343f1e5840
-    # Anyone know how to get it to do a silent install?
     try $WINE "$WINETRICKS_CACHE"/mono-2.2-gtksharp-2.12.7-win32-5.exe $WINETRICKS_SILENT
 
     # FIXME: what should this be for mono 2.2?
@@ -1435,6 +1474,28 @@ _EOF_
 
 #----------------------------------------------------------------
 
+load_mono24() {
+    # Load Mono, have it handle all .net requests
+    download .  http://ftp.novell.com/pub/mono/archive/2.4.2.3/windows-installer/3/mono-2.4.2.3-gtksharp-2.12.9-win32-3.exe 4f0d051bcedd7668e63c12903310be0ea38f9654
+    try $WINE "$WINETRICKS_CACHE"/mono-2.4.2.3-gtksharp-2.12.9-win32-3.exe $WINETRICKS_SILENT
+
+    # FIXME: what should this be for mono 2.4?
+    cat > "$WINETRICKS_TMP"/mono_2.0.reg <<_EOF_
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\Software\Microsoft\NET Framework Setup\NDP\v2.0.50727]
+"Install"=dword:00000001
+"SP"=dword:00000001
+
+[HKEY_LOCAL_MACHINE\Software\Microsoft\.NETFramework\policy\v2.0]
+"4322"="3706-4322"
+_EOF_
+    try $WINE regedit "$WINETRICKS_TMP"/mono_2.0.reg
+    rm -f "$WINETRICKS_TMP"/mono_2.0.reg
+}
+
+#----------------------------------------------------------------
+
 load_mpc() {
     download . $SOURCEFORGE/guliverkli2/mplayerc_20080414.zip bc9f922d7151e7cc7fef429b085cf208ef989bab
     cd "$WINEPREFIX"/drive_c
@@ -1525,18 +1586,20 @@ load_msxml3() {
 #----------------------------------------------------------------
 
 load_msxml4() {
-    # http://www.microsoft.com/downloads/details.aspx?familyid=24B7D141-6CDF-4FC4-A91B-6F18FE6921D4
     if test ! -f "$WINETRICKS_CACHE"/msxml4.msi
     then
-       download . http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
-       rm -rf "$WINETRICKS_TMP"/*
+        # MS06-071: http://www.microsoft.com/downloads/details.aspx?familyid=24B7D141-6CDF-4FC4-A91B-6F18FE6921D4
+        # download . http://download.microsoft.com/download/e/2/e/e2e92e52-210b-4774-8cd9-3a7a0130141d/msxml4-KB927978-enu.exe d364f9fe80c3965e79f6f64609fc253dfeb69c25
+        # MS07-042: http://www.microsoft.com/downloads/details.aspx?FamilyId=021E12F5-CB46-43DF-A2B8-185639BA2807
+        download . http://download.microsoft.com/download/9/4/2/9422e6b6-08ee-49cb-9f05-6c6ee755389e/msxml4-KB936181-enu.exe 73d75d7b41f8a3d49f272e74d4f73bb5e82f1acf
+        rm -rf "$WINETRICKS_TMP"/*
 
-       try $WINE "$WINETRICKS_CACHE"/msxml4-KB927978-enu.exe "/x:`$WINE winepath -w "$WINETRICKS_TMP"`" $WINETRICKS_QUIET
-       if test ! -f "$WINETRICKS_TMP"/msxml.msi
-       then
+        try $WINE "$WINETRICKS_CACHE"/msxml4-KB936181-enu.exe "/x:`$WINE winepath -w "$WINETRICKS_TMP"`" $WINETRICKS_QUIET
+        if test ! -f "$WINETRICKS_TMP"/msxml.msi
+        then
           die msxml.msi not found
-       fi
-       mv "$WINETRICKS_TMP"/msxml.msi "$WINETRICKS_CACHE"/msxml4.msi
+        fi
+        mv "$WINETRICKS_TMP"/msxml.msi "$WINETRICKS_CACHE"/msxml4.msi
     fi
 
     try $WINE msiexec /i "$WINETRICKS_CACHE"/msxml4.msi $WINETRICKS_QUIET
@@ -1545,10 +1608,20 @@ load_msxml4() {
 #----------------------------------------------------------------
 
 load_msxml6() {
-    # http://www.microsoft.com/downloads/details.aspx?FamilyID=993c0bcf-3bcf-4009-be21-27e85e1857b1
-    download . http://download.microsoft.com/download/2/e/0/2e01308a-e17f-4bf9-bf48-161356cf9c81/msxml6.msi 2308743ddb4cb56ae910e461eeb3eab0a9e58058
+    # If this is just a dependency check, don't re-install
+    if test $PACKAGE != msxml6 && test -f "$WINDIR"/system32/msxml6.dll
+    then
+        echo "prerequisite msxml6 already installed, skipping"
+        return
+    fi
 
-    try $WINE msiexec /i "$WINETRICKS_CACHE"/msxml6.msi $WINETRICKS_QUIET
+    # http://www.microsoft.com/downloads/details.aspx?FamilyID=993c0bcf-3bcf-4009-be21-27e85e1857b1
+    # download . http://download.microsoft.com/download/2/e/0/2e01308a-e17f-4bf9-bf48-161356cf9c81/msxml6.msi 2308743ddb4cb56ae910e461eeb3eab0a9e58058
+    # Service Pack 1
+    # http://www.microsoft.com/downloads/details.aspx?familyid=D21C292C-368B-4CE1-9DAB-3E9827B70604
+    download . http://download.microsoft.com/download/e/a/f/eafb8ee7-667d-4e30-bb39-4694b5b3006f/msxml6_x86.msi
+
+    try $WINE msiexec /i "$WINETRICKS_CACHE"/msxml6_x86.msi $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
@@ -1589,9 +1662,26 @@ load_ole2() {
 
 load_openwatcom() {
     # http://www.openwatcom.org
-
     download . "http://ftp.openwatcom.org/ftp/open-watcom-c-win32-1.8.exe" 44afd1fabfdf0374f614f054824e60ac560f9dc0
-    try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe $WINETRICKS_SILENT
+    if [ $WINETRICKS_QUIET ]
+    then
+        # Options documented at http://bugzilla.openwatcom.org/show_bug.cgi?id=898
+        # But they don't seem to work on wine, so jam them into setup.inf
+        # Pick smallest installation that supports 16 bit C and C++
+        cd "$WINETRICKS_TMP"
+        cp "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe .
+        unzip open-watcom-c-win32-1.8.exe setup.inf
+        sed -i 's/tools16=.*/tools16=true/' setup.inf
+        zip -f open-watcom-c-win32-1.8.exe
+        try $WINE open-watcom-c-win32-1.8.exe -s
+        cd "$olddir"
+    else
+        try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe
+    fi
+    if test ! -f "$WINEPREFIX"/drive_c/WATCOM/binnt/wcc.exe
+    then
+        warn "c:/watcom/binnt/wcc.exe not found; you probably didn't select 16 bit tools, and won't be able to buld win16test"
+    fi
 }
 
 #----------------------------------------------------------------
@@ -1606,6 +1696,57 @@ load_pdh() {
 
 #----------------------------------------------------------------
 
+load_psdk2003()
+{
+  # Note: aborts on 64 bit windows with dialog saying "don't run on WoW"
+  # http://www.microsoft.com/downloads/details.aspx?familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb
+  download psdk2003 http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe 5c7dc2e1eb902b376d7797cc383fefdfc64ff9c9
+  echo "This takes about an hour, and fails at the end, but enough is installed to be useful, I hope.  See http://bugs.winehq.org/show_bug.cgi?id=19673"
+  try $WINE "$WINETRICKS_CACHE"/psdk2003/PSDK-x86
+}
+
+#----------------------------------------------------------------
+
+load_psdkvista()
+{
+  # http://www.microsoft.com/downloads/details.aspx?familyid=0baf2b35-c656-4969-ace8-e4c0c0716adb
+  warn "Vista SDK doesn't work yet as of wine-1.1.28"
+  load_dotnet20
+  download psdkvista download.microsoft.com/download/c/a/1/ca145d10-e254-475c-85f9-1439f4cd2a9e/Setup.exe 756c21a7fc9b831f7200f3f44ae55cc7689e8063
+  #chmod +x "$WINETRICKS_CACHE"/psdkvista/Setup.exe
+  cd "$WINETRICKS_CACHE"/psdkvista
+  try $WINE Setup.exe
+  cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
+load_psdkwin7()
+{
+  # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en
+  warn "Windows 7 SDK doesn't work yet as of wine-1.1.28"
+  load_vcrun2008 load_dotnet20
+  download psdkwin7 http://download.microsoft.com/download/7/A/B/7ABD2203-C472-4036-8BA0-E505528CCCB7/winsdk_web.exe a01dcc67a38f461e80ea649edf1353f306582507
+  #chmod +x "$WINETRICKS_CACHE"/psdkwin7/winsdk_web.exe
+  cd "$WINETRICKS_CACHE"/psdkwin7
+  try $WINE winsdk_web.exe
+  cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
+load_python26() {
+    download . http://www.python.org/ftp/python/2.6.2/python-2.6.2.msi 2d1503b0e8b7e4c72a276d4d9027cf4856b208b8
+    download . $SOURCEFORGE/project/pywin32/pywin32/Build%20214/pywin32-214.win32-py2.6.exe eca58f29b810d8e3e7951277ebb3e35ac35794a3
+    cd "$WINETRICKS_CACHE"
+    try $WINE msiexec /i python-2.6.2.msi ALLUSERS=1 $WINETRICKS_QUIET
+    # FIXME: unzip this instead of running it if quiet install?
+    try $WINE pywin32-214.win32-py2.6.exe
+    cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
 load_quicktime72() {
     echo "Quicktime needs gdiplus..."
     load_gdiplus
@@ -1776,9 +1917,11 @@ load_vbrun60() {
 
 load_vcrun6() {
     # Load the Visual C++ 6 runtime libraries, including the elusive mfc42u.dll
-    if test -f "$WINDIR"/system32/mfc42u.dll
+
+    # If this is just a dependency check, don't re-install
+    if test $PACKAGE != vcrun6 && test -f "$WINDIR"/system32/mfc42u.dll
     then
-        echo "vcrun6 already installed, skipping"
+        echo "prerequisite vcrun6 already installed, skipping"
         return
     fi
 
@@ -1827,19 +1970,18 @@ load_vcrun2003() {
 #----------------------------------------------------------------
 
 load_vcrun2005() {
-    # Load the Visual C++ 2005 runtime libraries
-    # See http://www.microsoft.com/downloads/details.aspx?familyid=32BC1BEE-A3F9-4C13-9C99-220B62A191EE
-    download vcrun2005 http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe 47fba37de95fa0e2328cf2e5c8ebb954c4b7b93c
-    try $WINE "$WINETRICKS_CACHE"/vcrun2005/vcredist_x86.exe $WINETRICKS_QUIET
-}
+    # Load the latest Visual C++ 2005 runtime libraries
+    # If this is just a dependency check, don't re-install
 
-#----------------------------------------------------------------
-
-load_vcrun2005sp1() {
-    # Load the Visual C++ 2005 SP1 runtime libraries
-    # See http://www.microsoft.com/downloads/details.aspx?familyid=200b2fd9-ae1a-4a14-984d-389c36f85647
-    download vcrun2005sp1 http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe 7dfa98be78249921dd0eedb9a3dd809e7d215c8d
-    try $WINE "$WINETRICKS_CACHE"/vcrun2005sp1/vcredist_x86.exe $WINETRICKS_QUIET
+    # SP1 + ATL security fix build 4053 (MS09-035)
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=766A6AF7-EC73-40FF-B072-9112BAB119C2
+    if test $PACKAGE != vcrun2005 && test -d "$WINDIR"/winsxs/x86_Microsoft.VC80.MFC_1fc8b3b9a1e18e3b_8.0.50727.4053_x-ww_b77cec8e
+    then
+        echo "prerequisite vcrun2005 already installed, skipping"
+        return
+    fi
+    download vcrun2005-ms09-035 http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe e052789ebad7dc8d6f8505a9295b0576babd125e
+    try $WINE "$WINETRICKS_CACHE"/vcrun2005-ms09-035/vcredist_x86.exe $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
@@ -1850,28 +1992,25 @@ load_vcrun2008() {
     # installer work on older Wine (e.g., the stabe 1.0.1).
     volnum
 
-    # Load the Visual C++ 2008 runtime libraries
-    # See http://www.microsoft.com/downloads/details.aspx?familyid=9b2da534-3e03-4391-8a4d-074b9f2bc1bf
-    download vcrun2008 http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5381140/vcredist_x86.exe 56719288ab6514c07ac2088119d8a87056eeb94a
-    try $WINE "$WINETRICKS_CACHE"/vcrun2008/vcredist_x86.exe $WINETRICKS_QUIET
-}
+    # Load the latest Visual C++ 2008 runtime libraries
+    # If this is just a dependency check, don't re-install
+    # SP1 + ATL security fix build 4148 (MS09-035)
+    # See http://www.microsoft.com/downloads/details.aspx?familyid=2051a0c1-c9b5-4b0a-a8f5-770a549fd78c
+    if test $PACKAGE != vcrun2008 && test -d "$WINDIR"/winsxs/x86_Microsoft.VC90.MFC_1fc8b3b9a1e18e3b_9.0.30729.4148_x-ww_a57c1f53
+    then
+        echo "prerequisite vcrun2008 already installed, skipping"
+        return
+    fi
+    download vcrun2008-ms09-035 http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/vcredist_x86.exe bd18409cfe75b88c2a9432d36d96f4bf125a3237
+    try $WINE "$WINETRICKS_CACHE"/vcrun2008-ms09-035/vcredist_x86.exe $WINETRICKS_QUIET
 
-#----------------------------------------------------------------
-
-load_vcrun2008sp1() {
-    # This should be fixed in recent Wine, but for those using 1.0.1, fails.
-    volnum
-
-    # Load the Visual C++ 2008 SP1 runtime libraries
-    # See http://www.microsoft.com/downloads/details.aspx?FamilyID=a5c84275-3b97-4ab7-a40d-3802b2af5fc2
-    download vcrun2008sp1 http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe 6939100e397cef26ec22e95e53fcd9fc979b7bc9
-    try $WINE "$WINETRICKS_CACHE"/vcrun2008sp1/vcredist_x86.exe $WINETRICKS_QUIET
 }
 
 #----------------------------------------------------------------
 
 load_vjrun20() {
     load_dotnet20
+    # See http://www.microsoft.com/downloads/details.aspx?FamilyId=E9D87F37-2ADC-4C32-95B3-B5E3A21BAB2C
     download vjrun20 http://download.microsoft.com/download/9/2/3/92338cd0-759f-4815-8981-24b437be74ef/vjredist.exe 80a098e36b90d159da915aebfbfbacf35f302bd8
     if [ $WINETRICKS_QUIET ]
     then
@@ -1883,6 +2022,102 @@ load_vjrun20() {
 
 #----------------------------------------------------------------
 
+load_vc2005express()
+{
+    # Thanks to http://blogs.msdn.com/astebner/articles/551674.aspx for the recipe
+    load_dotnet20
+    load_msxml6
+
+    # http://go.microsoft.com/fwlink/?LinkId=51410
+    download vc2005express http://download.microsoft.com/download/8/3/a/83aad8f9-38ba-4503-b3cd-ba28c360c27b/ENU/vcsetup.exe 0292ae1d576edd8ee5350a27113c94c9f9958d5c
+
+    if [ $WINETRICKS_QUIET ]
+    then
+        # Thanks to Aaron Stebner's unattended install recipe
+        # http://blogs.msdn.com/astebner/archive/2006/03/19/555326.aspx
+
+        # "http://go.microsoft.com/fwlink/?LinkId=51417"
+        download vc2005express http://download.microsoft.com/download/0/5/A/05AA45B9-A4BE-4872-8D57-733DF5297284/Ixpvc.exe ce0da62b5649f33c7a150de276d799fb2d68d12a
+
+        cd "$WINETRICKS_TMP"
+        rm -rf vc2005express.tmp || true
+        mkdir vc2005express.tmp
+        cd vc2005express.tmp
+        cabextract "$WINETRICKS_CACHE"/vc2005express/vcsetup.exe
+        cp "$WINETRICKS_CACHE"/vc2005express/Ixpvc.exe .
+        chmod +x Ixpvc.exe
+        # Add /qn after ReallySuppress for a really silent install (but then you won't see any errors)
+
+        try $WINE Ixpvc /t:"$WINETRICKS_TMP_WIN\\\\vc2005express.tmp" /q:a /c:"msiexec /i vcsetup.msi VSEXTUI=1 ADDLOCAL=ALL REBOOT=ReallySuppress"
+
+        cd ..
+        rm -rf vc2005express.tmp || true
+    else
+        warn "Don't forget to install the IDE, or mt.exe won't be installed"
+        try $WINE "$WINETRICKS_CACHE"/vc2005express/vcsetup.exe
+        # The interactive installer seems to be asynchronous, so wait until its log file directory is created
+        while test ! -d "$programfilesdir_unix/Microsoft Visual Studio 8/Microsoft Visual C++ 2005 Express Edition - ENU/Logs"
+        do
+          echo "Waiting for install to finish..."
+          sleep 10
+        done
+    fi
+    cd "$olddir"
+}
+
+#----------------------------------------------------------------
+
+load_vc2005trial()
+{
+    load_vcrun6
+    load_dotnet20
+    load_msxml6
+
+    echo "Downloading/checksumming Visual C++ 2005 Trial.  This will take some time!"
+    download vc2005trial http://download.microsoft.com/download/6/f/5/6f5f7a01-50bb-422d-8742-c099c8896969/En_vs_2005_vsts_180_Trial.img 0204bce1dacfa15b45052647139b35e31e9e36ee
+
+    # FIXME: linux-specific
+    IMG="$WINETRICKS_CACHE"/vc2005trial/En_vs_2005_vsts_180_Trial.img
+    warn "Mounting Visual Studio 2005 Trial disk image..."
+    case "$GUI-$DE" in
+    gnome) 
+      1-gksudo "mkdir -p /mnt/winetricks/vc2005trial"
+      1-gksudo "mount -o ro,loop $IMG /mnt/winetricks/vc2005trial"
+      ;;
+    *)
+      sudo mkdir -p /mnt/winetricks/vc2005trial
+      sudo mount -o ro,loop $IMG /mnt/winetricks/vc2005trial
+      ;;
+    esac
+
+    if false && [ $WINETRICKS_QUIET ]
+    then
+      # Thanks to http://blogs.msdn.com/astebner/archive/2005/05/24/421314.aspx for unattended install method
+      # See also http://support.microsoft.com/?kbid=913445
+      die "not implemented yet"
+    else
+      try $WINE /mnt/winetricks/vc2005trial/vs/setup/setup.exe
+      while ps | grep -q setup.exe
+      do
+          sleep 10
+          echo waiting for setup to finish
+      done
+    fi
+
+    case "$GUI-$DE" in
+    gnome) 
+      1-gksudo "umount /mnt/winetricks/vc2005trial"
+      1-gksudo "rm -rf /mnt/winetricks"
+      ;;
+    *)
+      sudo umount /mnt/winetricks/vc2005trial
+      sudo rm -rf /mnt/winetricks
+      ;;
+    esac
+}
+
+#----------------------------------------------------------------
+
 load_vlc() {
     download . http://www.videolan.org/mirror-geo-redirect.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf
     try $WINE "$WINETRICKS_CACHE"/vlc-0.8.6f-win32.exe $WINETRICKS_S
@@ -1915,6 +2150,8 @@ load_wmp9() {
     # Not really expected to work well yet; see
     # http://appdb.winehq.org/appview.php?versionId=1449
 
+    load_wsh56
+
     set_winver win2k
 
     # See also http://www.microsoft.com/windows/windowsmedia/player/9series/default.aspx
@@ -1941,6 +2178,8 @@ load_wmp9() {
 load_wmp10() {
     # See http://appdb.winehq.org/appview.php?iVersionId=3212
 
+    load_wsh56
+
     # See also http://www.microsoft.com/windows/windowsmedia/player/10
     download . http://download.microsoft.com/download/1/2/A/12A31F29-2FA9-4F50-B95D-E45EF7013F87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657
 
@@ -1977,8 +2216,16 @@ load_wenquanyi() {
 #----------------------------------------------------------------
 
 load_wsh56() {
+    # If this is just a dependency check, don't re-install
+    if test $PACKAGE != wsh56 && test -f "$WINDIR"/system32/wscript.exe
+    then
+        echo "prerequisite wsh56 already installed, skipping"
+        return
+    fi
+
+    load_vcrun6
+
     # See also http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=C717D943-7E4B-4622-86EB-95A22B832CAA
-    # FIXME: depends on vcrun6, should we install that automatically?
     download . http://download.microsoft.com/download/2/8/a/28a5a346-1be1-4049-b554-3bc5f3174353/WindowsXP-Windows2000-Script56-KB917344-x86-enu.exe f4692766caa3ee9b38d4166845486c6199a33457
 
     try $WINE "$WINETRICKS_CACHE"/WindowsXP-Windows2000-Script56-KB917344-x86-enu.exe $WINETRICKS_QUIET
@@ -2009,16 +2256,17 @@ load_wsh56vb() {
 load_xact() {
     helper_directx_dl ;
 
-    # xactengine?_?.dll and X3DAudio?_?.dll - extract
+    # xactengine?_?.dll, X3DAudio?_?.dll, xaudio?_?.dll, xapofx?_?.dll - extract
     cabextract -d "$WINETRICKS_TMP" -L -F '*_xact_*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
     cabextract -d "$WINETRICKS_TMP" -L -F '*_x3daudio_*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
+    cabextract -d "$WINETRICKS_TMP" -L -F '*_xaudio_*x86*' "$WINETRICKS_CACHE"/$DIRECTX_NAME
     for x in `ls "$WINETRICKS_TMP"/*.cab`
     do
       cabextract -d "$WINDIR"/system32 -L -F '*.dll' "$x"
     done
 
-    # xactengine?_?.dll - register
-    for x in `ls "$WINDIR"/system32/xactengine*`
+    # xactengine?_?.dll, xaudio?_?.dll - register
+    for x in `ls "$WINDIR"/system32/xactengine* "$WINDIR"/system32/xaudio*`
     do
       try $WINE regsvr32 `basename $x`
     done
@@ -2028,7 +2276,7 @@ load_xact() {
 
 load_xvid() {
     # xvid
-    test -f "$WINDIR"/system32/[Mm][Ff][Cc]42.[Dd][Ll][Ll] || load_vcrun6
+    load_vcrun6
     download . http://www.koepi.info/Xvid-1.2.2-07062009.exe 435203e7f713c4484ca4f50f43e847f3dc118962
     try $WINE "$WINETRICKS_CACHE"/Xvid-1.2.2-07062009.exe $WINETRICKS_SILENT
 }
@@ -2136,12 +2384,14 @@ do
         ;;
     -v) set -x;;
     art2kmin) load_art2kmin;;
+    atmlib) load_atmlib;;
     ahk|autohotkey) load_autohotkey;;
     cc580|comctl32) load_cc580;;
     comctl32.ocx) load_comctl32ocx;;
     colorprofile) load_colorprofile;;
     corefonts) load_corefonts;;
     controlpad|fm20) load_controlpad;;
+    cygwin) load_cygwin;;
     d3dx9) load_d3dx9;;
     dcom98) load_dcom98;;
     dinput8) load_dinput8;;
@@ -2176,6 +2426,7 @@ do
     mfc40) load_mfc40;;
     mono19|mono20) load_mono20;;
     mono22) load_mono22;;
+    mono24) load_mono24;;
     mpc) load_mpc;;
     msi2) load_msi2;;
     mshflxgd) load_mshflxgd;;
@@ -2189,6 +2440,10 @@ do
     ole2) load_ole2;;
     openwatcom|watcom) load_openwatcom;;
     pdh) load_pdh;;
+    psdk2003) load_psdk2003;;
+    psdkvista) load_psdkvista;;
+    psdkwin7) load_psdkwin7;;
+    python|python26) load_python26;;
     quicktime72) load_quicktime72;;
     riched20) load_riched20;;
     riched30) load_riched30;;
@@ -2200,20 +2455,20 @@ do
     vbrun400|vb4run) load_vb4run;;
     vbrun500|vbvm50|vb5run) load_vbvm50;;
     vbrun600|vbrun60|vb6run) load_vbrun60;;
+    vc2005express) load_vc2005express;;
+    vc2005trial) load_vc2005trial;;
     vcrun600|vcrun6|mfc42) load_vcrun6;;
     vcrun2003) load_vcrun2003;;
-    vcrun2005) load_vcrun2005;;
-    vcrun2005sp1) load_vcrun2005sp1;;
-    vcrun2008) load_vcrun2008;;
-    vcrun2008sp1) load_vcrun2008sp1;;
+    vcrun2005|vcrun2005sp1) load_vcrun2005;;
+    vcrun2008|vcrun2008sp1) load_vcrun2008;;
     vjrun20) load_vjrun20;;
     vlc) load_vlc;;
     wininet) load_wininet;;
     wme9) load_wme9;;
-    wmp9) load_vcrun6; load_wsh56; load_wmp9;;
-    wmp10) load_vcrun6; load_wsh56; load_wmp10;;
+    wmp9) load_wmp9;;
+    wmp10) load_wmp10;;
     wenquanyi) load_wenquanyi;;
-    wsh56) load_vcrun6; load_wsh56;;
+    wsh56) load_wsh56;;
     wsh56js) load_wsh56js;;
     wsh56vb) load_wsh56vb;;
     xact|xactengine|x3daudio) load_xact;;