diff --git a/_service b/_service
index 66e8583..e410604 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v3.7</param>
+    <param name="revision">refs/tags/v3.8</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>
@@ -11,7 +11,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">wined3d9(.*)</param>
     <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
-    <param name="revision">refs/tags/wine-d3d9-3.6</param>
+    <param name="revision">refs/tags/wine-d3d9-3.7</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/wine-staging-3.7.tar.xz b/wine-staging-3.7.tar.xz
deleted file mode 100644
index 0eb5428..0000000
--- a/wine-staging-3.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:798085a29343dabc7c7a7832a4588cc1e5b9dc317493655060f4484fc109caf0
-size 7530408
diff --git a/wine-staging-3.8.tar.xz b/wine-staging-3.8.tar.xz
new file mode 100644
index 0000000..95dfa84
--- /dev/null
+++ b/wine-staging-3.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c329b17dfb310542c1be0db7eda9db36233f3ed6b66ee191a0855c60258bca17
+size 7535668
diff --git a/wine.spec b/wine.spec
index ce4d584..b9b1394 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.7
+%define staging_version 3.8
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
diff --git a/winetricks b/winetricks
index caadbfc..d9af7f2 100644
--- a/winetricks
+++ b/winetricks
@@ -8118,11 +8118,14 @@ load_icodecs()
             controlclick, Button4  ; Finish
         }
         winwaitclose
-        ; Dangling explorer window
-        winwait, Wine Explorer
-        sleep 1000
-        winclose, Wine Explorer
     "
+        # Note, this leaves a dangling explorer window. The window name changed at some point
+        # because of a fixed wine bug that I'm too lazy to find. Since AHK doesn't make command line
+        # arguments easily accessible, we'd have to just kill all explorer.exe processes.
+        #
+        # So instead, use system kill
+        inode_pid="$(pgrep -f 'explorer.exe C:\\Program Files\\Ligos\\Indeo')"
+        kill -HUP "$inode_pid"
 }
 
 #----------------------------------------------------------------