diff --git a/wine.spec b/wine.spec
index 8389091..37b4566 100644
--- a/wine.spec
+++ b/wine.spec
@@ -140,7 +140,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 3.6
+%define staging_version 3.7
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -148,7 +148,7 @@ BuildRequires:  libva-devel
 %endif
 %if %{nine}
 # upstream patch target version
-%define nine_version 3.5
+%define nine_version 3.6
 BuildRequires:  Mesa-libd3d-devel
 BuildRequires:  dri2proto-devel
 BuildRequires:  libOSMesa-devel
diff --git a/winetricks b/winetricks
index 56625c9..55d029a 100644
--- a/winetricks
+++ b/winetricks
@@ -5342,7 +5342,8 @@ helper_winxpsp3()
     # https://www.microsoft.com/en-us/download/details.aspx?id=24
     # https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe
     # Mirror list: http://www.filewatcher.com/m/WindowsXP-KB936929-SP3-x86-ENU.exe.331805736-0.html
-    w_download_to winxpsp3 ftp://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
+    # 2018/04/04: http://www.download.windowsupdate.com/msdownload/update/software/dflt/2008/04/windowsxp-kb936929-sp3-x86-enu_c81472f7eeea2eca421e116cd4c03e2300ebfde4.exe
+    w_download_to winxpsp3 ftp://ftp.emacinc.com/LegacyProducts/SBC/drivers/vdx/WINXP/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654
 
     w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe
 }
@@ -12321,53 +12322,6 @@ _EOF_
 
 #----------------------------------------------------------------
 
-w_metadata picasa39 apps \
-    title="Picasa 3.9" \
-    publisher="Google" \
-    year="2014" \
-    file1="picasa39-setup.exe" \
-    installed_exe1="$W_PROGRAMS_X86_WIN/Google/Picasa3/Picasa3.exe"
-
-load_picasa39()
-{
-    # 2016/01/02: 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
-
-    w_download https://dl.google.com/picasa/picasa39-setup.exe 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08
-    if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google"; then
-        w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See https://bugs.winehq.org/show_bug.cgi?id=29434 for more details."
-    fi
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        SetTitleMatchMode, 2
-        run picasa39-setup.exe
-        WinWait, Picasa 3 Setup
-        if ( w_opt_unattended > 0 ) {
-             Sleep 1000
-             ControlClick Button2 ;I Agree - License
-             Sleep 1000
-             WinWait, Picasa 3 Setup, Choose Install Location
-             ControlClick Button2 ;Install
-             Sleep 1000
-             WinWait, Picasa 3 Setup, Picasa 3 has been installed on your computer
-             Sleep 500
-             ControlClick Button5 ; Desktop Icon
-             Sleep 500
-             ControlClick Button6 ; Quick Launch
-             Sleep 500
-             ControlClick Button7 ; Default search off
-             Sleep 500
-             ControlClick Button8 ; Usage statistics sent
-             Sleep 500
-             ControlClick Button4 ; Run Picasa
-             Sleep 500
-             ControlClick Button2 ; Finish
-        }
-        WinWaitClose
-        "
-}
-
-#----------------------------------------------------------------
-
 w_metadata protectionid apps \
     title="Protection ID" \
     publisher="CDKiLLER & TippeX" \
@@ -16756,40 +16710,6 @@ load_penpenxmas()
 
 #----------------------------------------------------------------
 
-w_metadata plantsvszombies games \
-    title="Plants vs. Zombies" \
-    publisher="PopCap Games" \
-    year="2009" \
-    media="download" \
-    file1="PlantsVsZombiesSetup.exe" \
-    installed_file1="$W_PROGRAMS_X86_WIN/PopCap Games/Plants vs. Zombies/PlantsVsZombies.exe"
-
-load_plantsvszombies()
-{
-    w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" 4b4bb4d19fb639e5698983e39d7ad061c7667bcec19056560532c7ad0d67d0e4
-
-    w_try_cd "$W_CACHE/$W_PACKAGE"
-    w_ahk_do "
-        run PlantsVsZombiesSetup.exe
-        winwait, Plants vs. Zombies Installer
-        if ( w_opt_unattended > 0 ) {
-            sleep 1000
-            send {Enter}
-            winwait, Plants vs. Zombies License Agreement
-            ControlClick Button1
-        }
-        winwait, Plants vs. Zombies Installation Complete!
-        if ( w_opt_unattended > 0 ) {
-            sleep 1000
-            send {Space}{Enter}
-            ControlClick, x309 y278, Plants vs. Zombies Installation Complete!,,,, Pos
-        }
-        WinWaitClose
-    "
-}
-
-#----------------------------------------------------------------
-
 w_metadata popfs games \
     title="Prince of Persia: The Forgotten Sands" \
     publisher="Ubisoft" \