diff --git a/SDL2-2.30.8/.git-hash b/SDL2-2.30.8/.git-hash
deleted file mode 100644
index 39b4476443..0000000000
--- a/SDL2-2.30.8/.git-hash
+++ /dev/null
@@ -1 +0,0 @@
-79ec168f3c1e2fe27335cb8886439f7ef676fb49
diff --git a/SDL2-2.30.9/.git-hash b/SDL2-2.30.9/.git-hash
new file mode 100644
index 0000000000..8ec78d6fc1
--- /dev/null
+++ b/SDL2-2.30.9/.git-hash
@@ -0,0 +1 @@
+c98c4fbff6d8f3016a3ce6685bf8f43433c3efcc
diff --git a/SDL2-2.30.8/BUGS.txt b/SDL2-2.30.9/BUGS.txt
similarity index 100%
rename from SDL2-2.30.8/BUGS.txt
rename to SDL2-2.30.9/BUGS.txt
diff --git a/SDL2-2.30.8/COPYING.txt b/SDL2-2.30.9/COPYING.txt
similarity index 100%
rename from SDL2-2.30.8/COPYING.txt
rename to SDL2-2.30.9/COPYING.txt
diff --git a/SDL2-2.30.8/README-SDL.txt b/SDL2-2.30.9/README-SDL.txt
similarity index 100%
rename from SDL2-2.30.8/README-SDL.txt
rename to SDL2-2.30.9/README-SDL.txt
diff --git a/SDL2-2.30.8/README.txt b/SDL2-2.30.9/README.txt
similarity index 100%
rename from SDL2-2.30.8/README.txt
rename to SDL2-2.30.9/README.txt
diff --git a/SDL2-2.30.8/WhatsNew.txt b/SDL2-2.30.9/WhatsNew.txt
similarity index 100%
rename from SDL2-2.30.8/WhatsNew.txt
rename to SDL2-2.30.9/WhatsNew.txt
diff --git a/SDL2-2.30.8/cmake/sdl2-config-version.cmake b/SDL2-2.30.9/cmake/sdl2-config-version.cmake
similarity index 100%
rename from SDL2-2.30.8/cmake/sdl2-config-version.cmake
rename to SDL2-2.30.9/cmake/sdl2-config-version.cmake
diff --git a/SDL2-2.30.8/cmake/sdl2-config.cmake b/SDL2-2.30.9/cmake/sdl2-config.cmake
similarity index 99%
rename from SDL2-2.30.8/cmake/sdl2-config.cmake
rename to SDL2-2.30.9/cmake/sdl2-config.cmake
index 411b78a515..bb284b8f96 100644
--- a/SDL2-2.30.8/cmake/sdl2-config.cmake
+++ b/SDL2-2.30.9/cmake/sdl2-config.cmake
@@ -94,7 +94,7 @@ if(EXISTS "${_sdl2main_library}")
     endif()
     set(SDL2_SDL2main_FOUND TRUE)
 else()
-    set(SDL2_SDL2_FOUND FALSE)
+    set(SDL2_SDL2main_FOUND FALSE)
 endif()
 unset(_sdl2main_library)
 
diff --git a/SDL2-2.30.8/docs/CONTRIBUTING.md b/SDL2-2.30.9/docs/CONTRIBUTING.md
similarity index 100%
rename from SDL2-2.30.8/docs/CONTRIBUTING.md
rename to SDL2-2.30.9/docs/CONTRIBUTING.md
diff --git a/SDL2-2.30.8/docs/README-android.md b/SDL2-2.30.9/docs/README-android.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-android.md
rename to SDL2-2.30.9/docs/README-android.md
diff --git a/SDL2-2.30.8/docs/README-cmake.md b/SDL2-2.30.9/docs/README-cmake.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-cmake.md
rename to SDL2-2.30.9/docs/README-cmake.md
diff --git a/SDL2-2.30.8/docs/README-directfb.md b/SDL2-2.30.9/docs/README-directfb.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-directfb.md
rename to SDL2-2.30.9/docs/README-directfb.md
diff --git a/SDL2-2.30.8/docs/README-dynapi.md b/SDL2-2.30.9/docs/README-dynapi.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-dynapi.md
rename to SDL2-2.30.9/docs/README-dynapi.md
diff --git a/SDL2-2.30.8/docs/README-emscripten.md b/SDL2-2.30.9/docs/README-emscripten.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-emscripten.md
rename to SDL2-2.30.9/docs/README-emscripten.md
diff --git a/SDL2-2.30.8/docs/README-gdk.md b/SDL2-2.30.9/docs/README-gdk.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-gdk.md
rename to SDL2-2.30.9/docs/README-gdk.md
diff --git a/SDL2-2.30.8/docs/README-gesture.md b/SDL2-2.30.9/docs/README-gesture.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-gesture.md
rename to SDL2-2.30.9/docs/README-gesture.md
diff --git a/SDL2-2.30.8/docs/README-git.md b/SDL2-2.30.9/docs/README-git.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-git.md
rename to SDL2-2.30.9/docs/README-git.md
diff --git a/SDL2-2.30.8/docs/README-hg.md b/SDL2-2.30.9/docs/README-hg.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-hg.md
rename to SDL2-2.30.9/docs/README-hg.md
diff --git a/SDL2-2.30.8/docs/README-ios.md b/SDL2-2.30.9/docs/README-ios.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-ios.md
rename to SDL2-2.30.9/docs/README-ios.md
diff --git a/SDL2-2.30.8/docs/README-kmsbsd.md b/SDL2-2.30.9/docs/README-kmsbsd.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-kmsbsd.md
rename to SDL2-2.30.9/docs/README-kmsbsd.md
diff --git a/SDL2-2.30.8/docs/README-linux.md b/SDL2-2.30.9/docs/README-linux.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-linux.md
rename to SDL2-2.30.9/docs/README-linux.md
diff --git a/SDL2-2.30.8/docs/README-macos.md b/SDL2-2.30.9/docs/README-macos.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-macos.md
rename to SDL2-2.30.9/docs/README-macos.md
diff --git a/SDL2-2.30.8/docs/README-n3ds.md b/SDL2-2.30.9/docs/README-n3ds.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-n3ds.md
rename to SDL2-2.30.9/docs/README-n3ds.md
diff --git a/SDL2-2.30.8/docs/README-nacl.md b/SDL2-2.30.9/docs/README-nacl.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-nacl.md
rename to SDL2-2.30.9/docs/README-nacl.md
diff --git a/SDL2-2.30.8/docs/README-ngage.md b/SDL2-2.30.9/docs/README-ngage.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-ngage.md
rename to SDL2-2.30.9/docs/README-ngage.md
diff --git a/SDL2-2.30.8/docs/README-os2.md b/SDL2-2.30.9/docs/README-os2.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-os2.md
rename to SDL2-2.30.9/docs/README-os2.md
diff --git a/SDL2-2.30.8/docs/README-pandora.md b/SDL2-2.30.9/docs/README-pandora.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-pandora.md
rename to SDL2-2.30.9/docs/README-pandora.md
diff --git a/SDL2-2.30.8/docs/README-platforms.md b/SDL2-2.30.9/docs/README-platforms.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-platforms.md
rename to SDL2-2.30.9/docs/README-platforms.md
diff --git a/SDL2-2.30.8/docs/README-porting.md b/SDL2-2.30.9/docs/README-porting.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-porting.md
rename to SDL2-2.30.9/docs/README-porting.md
diff --git a/SDL2-2.30.8/docs/README-ps2.md b/SDL2-2.30.9/docs/README-ps2.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-ps2.md
rename to SDL2-2.30.9/docs/README-ps2.md
diff --git a/SDL2-2.30.8/docs/README-psp.md b/SDL2-2.30.9/docs/README-psp.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-psp.md
rename to SDL2-2.30.9/docs/README-psp.md
diff --git a/SDL2-2.30.8/docs/README-raspberrypi.md b/SDL2-2.30.9/docs/README-raspberrypi.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-raspberrypi.md
rename to SDL2-2.30.9/docs/README-raspberrypi.md
diff --git a/SDL2-2.30.8/docs/README-riscos.md b/SDL2-2.30.9/docs/README-riscos.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-riscos.md
rename to SDL2-2.30.9/docs/README-riscos.md
diff --git a/SDL2-2.30.8/docs/README-touch.md b/SDL2-2.30.9/docs/README-touch.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-touch.md
rename to SDL2-2.30.9/docs/README-touch.md
diff --git a/SDL2-2.30.8/docs/README-versions.md b/SDL2-2.30.9/docs/README-versions.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-versions.md
rename to SDL2-2.30.9/docs/README-versions.md
diff --git a/SDL2-2.30.8/docs/README-visualc.md b/SDL2-2.30.9/docs/README-visualc.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-visualc.md
rename to SDL2-2.30.9/docs/README-visualc.md
diff --git a/SDL2-2.30.8/docs/README-vita.md b/SDL2-2.30.9/docs/README-vita.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-vita.md
rename to SDL2-2.30.9/docs/README-vita.md
diff --git a/SDL2-2.30.8/docs/README-wince.md b/SDL2-2.30.9/docs/README-wince.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-wince.md
rename to SDL2-2.30.9/docs/README-wince.md
diff --git a/SDL2-2.30.8/docs/README-windows.md b/SDL2-2.30.9/docs/README-windows.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-windows.md
rename to SDL2-2.30.9/docs/README-windows.md
diff --git a/SDL2-2.30.8/docs/README-winrt.md b/SDL2-2.30.9/docs/README-winrt.md
similarity index 100%
rename from SDL2-2.30.8/docs/README-winrt.md
rename to SDL2-2.30.9/docs/README-winrt.md
diff --git a/SDL2-2.30.8/docs/README.md b/SDL2-2.30.9/docs/README.md
similarity index 100%
rename from SDL2-2.30.8/docs/README.md
rename to SDL2-2.30.9/docs/README.md
diff --git a/SDL2-2.30.8/docs/doxyfile b/SDL2-2.30.9/docs/doxyfile
similarity index 100%
rename from SDL2-2.30.8/docs/doxyfile
rename to SDL2-2.30.9/docs/doxyfile
diff --git a/SDL2-2.30.8/docs/release_checklist.md b/SDL2-2.30.9/docs/release_checklist.md
similarity index 100%
rename from SDL2-2.30.8/docs/release_checklist.md
rename to SDL2-2.30.9/docs/release_checklist.md
diff --git a/SDL2-2.30.8/include/SDL.h b/SDL2-2.30.9/include/SDL.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL.h
rename to SDL2-2.30.9/include/SDL.h
diff --git a/SDL2-2.30.8/include/SDL_assert.h b/SDL2-2.30.9/include/SDL_assert.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_assert.h
rename to SDL2-2.30.9/include/SDL_assert.h
diff --git a/SDL2-2.30.8/include/SDL_atomic.h b/SDL2-2.30.9/include/SDL_atomic.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_atomic.h
rename to SDL2-2.30.9/include/SDL_atomic.h
diff --git a/SDL2-2.30.8/include/SDL_audio.h b/SDL2-2.30.9/include/SDL_audio.h
similarity index 99%
rename from SDL2-2.30.8/include/SDL_audio.h
rename to SDL2-2.30.9/include/SDL_audio.h
index bd8e7ab6fa..9bb03327ec 100644
--- a/SDL2-2.30.8/include/SDL_audio.h
+++ b/SDL2-2.30.9/include/SDL_audio.h
@@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
  *   frames_ (with stereo output, two samples--left and right--would make a
  *   single sample frame). This number should be a power of two, and may be
  *   adjusted by the audio driver to a value more suitable for the hardware.
- *   Good values seem to range between 512 and 8096 inclusive, depending on
+ *   Good values seem to range between 512 and 4096 inclusive, depending on
  *   the application and CPU speed. Smaller values reduce latency, but can
  *   lead to underflow if the application is doing heavy processing and cannot
  *   fill the audio buffer in time. Note that the number of sample frames is
diff --git a/SDL2-2.30.8/include/SDL_bits.h b/SDL2-2.30.9/include/SDL_bits.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_bits.h
rename to SDL2-2.30.9/include/SDL_bits.h
diff --git a/SDL2-2.30.8/include/SDL_blendmode.h b/SDL2-2.30.9/include/SDL_blendmode.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_blendmode.h
rename to SDL2-2.30.9/include/SDL_blendmode.h
diff --git a/SDL2-2.30.8/include/SDL_clipboard.h b/SDL2-2.30.9/include/SDL_clipboard.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_clipboard.h
rename to SDL2-2.30.9/include/SDL_clipboard.h
diff --git a/SDL2-2.30.8/include/SDL_config.h b/SDL2-2.30.9/include/SDL_config.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config.h
rename to SDL2-2.30.9/include/SDL_config.h
diff --git a/SDL2-2.30.8/include/SDL_config.h.cmake b/SDL2-2.30.9/include/SDL_config.h.cmake
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config.h.cmake
rename to SDL2-2.30.9/include/SDL_config.h.cmake
diff --git a/SDL2-2.30.8/include/SDL_config.h.in b/SDL2-2.30.9/include/SDL_config.h.in
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config.h.in
rename to SDL2-2.30.9/include/SDL_config.h.in
diff --git a/SDL2-2.30.8/include/SDL_config_android.h b/SDL2-2.30.9/include/SDL_config_android.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_android.h
rename to SDL2-2.30.9/include/SDL_config_android.h
diff --git a/SDL2-2.30.8/include/SDL_config_emscripten.h b/SDL2-2.30.9/include/SDL_config_emscripten.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_emscripten.h
rename to SDL2-2.30.9/include/SDL_config_emscripten.h
diff --git a/SDL2-2.30.8/include/SDL_config_iphoneos.h b/SDL2-2.30.9/include/SDL_config_iphoneos.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_iphoneos.h
rename to SDL2-2.30.9/include/SDL_config_iphoneos.h
diff --git a/SDL2-2.30.8/include/SDL_config_macosx.h b/SDL2-2.30.9/include/SDL_config_macosx.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_macosx.h
rename to SDL2-2.30.9/include/SDL_config_macosx.h
diff --git a/SDL2-2.30.8/include/SDL_config_minimal.h b/SDL2-2.30.9/include/SDL_config_minimal.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_minimal.h
rename to SDL2-2.30.9/include/SDL_config_minimal.h
diff --git a/SDL2-2.30.8/include/SDL_config_ngage.h b/SDL2-2.30.9/include/SDL_config_ngage.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_ngage.h
rename to SDL2-2.30.9/include/SDL_config_ngage.h
diff --git a/SDL2-2.30.8/include/SDL_config_os2.h b/SDL2-2.30.9/include/SDL_config_os2.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_os2.h
rename to SDL2-2.30.9/include/SDL_config_os2.h
diff --git a/SDL2-2.30.8/include/SDL_config_pandora.h b/SDL2-2.30.9/include/SDL_config_pandora.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_pandora.h
rename to SDL2-2.30.9/include/SDL_config_pandora.h
diff --git a/SDL2-2.30.8/include/SDL_config_windows.h b/SDL2-2.30.9/include/SDL_config_windows.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_windows.h
rename to SDL2-2.30.9/include/SDL_config_windows.h
diff --git a/SDL2-2.30.8/include/SDL_config_wingdk.h b/SDL2-2.30.9/include/SDL_config_wingdk.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_wingdk.h
rename to SDL2-2.30.9/include/SDL_config_wingdk.h
diff --git a/SDL2-2.30.8/include/SDL_config_winrt.h b/SDL2-2.30.9/include/SDL_config_winrt.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_winrt.h
rename to SDL2-2.30.9/include/SDL_config_winrt.h
diff --git a/SDL2-2.30.8/include/SDL_config_xbox.h b/SDL2-2.30.9/include/SDL_config_xbox.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_config_xbox.h
rename to SDL2-2.30.9/include/SDL_config_xbox.h
diff --git a/SDL2-2.30.8/include/SDL_copying.h b/SDL2-2.30.9/include/SDL_copying.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_copying.h
rename to SDL2-2.30.9/include/SDL_copying.h
diff --git a/SDL2-2.30.8/include/SDL_cpuinfo.h b/SDL2-2.30.9/include/SDL_cpuinfo.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_cpuinfo.h
rename to SDL2-2.30.9/include/SDL_cpuinfo.h
diff --git a/SDL2-2.30.8/include/SDL_egl.h b/SDL2-2.30.9/include/SDL_egl.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_egl.h
rename to SDL2-2.30.9/include/SDL_egl.h
diff --git a/SDL2-2.30.8/include/SDL_endian.h b/SDL2-2.30.9/include/SDL_endian.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_endian.h
rename to SDL2-2.30.9/include/SDL_endian.h
diff --git a/SDL2-2.30.8/include/SDL_error.h b/SDL2-2.30.9/include/SDL_error.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_error.h
rename to SDL2-2.30.9/include/SDL_error.h
diff --git a/SDL2-2.30.8/include/SDL_events.h b/SDL2-2.30.9/include/SDL_events.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_events.h
rename to SDL2-2.30.9/include/SDL_events.h
diff --git a/SDL2-2.30.8/include/SDL_filesystem.h b/SDL2-2.30.9/include/SDL_filesystem.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_filesystem.h
rename to SDL2-2.30.9/include/SDL_filesystem.h
diff --git a/SDL2-2.30.8/include/SDL_gamecontroller.h b/SDL2-2.30.9/include/SDL_gamecontroller.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_gamecontroller.h
rename to SDL2-2.30.9/include/SDL_gamecontroller.h
diff --git a/SDL2-2.30.8/include/SDL_gesture.h b/SDL2-2.30.9/include/SDL_gesture.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_gesture.h
rename to SDL2-2.30.9/include/SDL_gesture.h
diff --git a/SDL2-2.30.8/include/SDL_guid.h b/SDL2-2.30.9/include/SDL_guid.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_guid.h
rename to SDL2-2.30.9/include/SDL_guid.h
diff --git a/SDL2-2.30.8/include/SDL_haptic.h b/SDL2-2.30.9/include/SDL_haptic.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_haptic.h
rename to SDL2-2.30.9/include/SDL_haptic.h
diff --git a/SDL2-2.30.8/include/SDL_hidapi.h b/SDL2-2.30.9/include/SDL_hidapi.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_hidapi.h
rename to SDL2-2.30.9/include/SDL_hidapi.h
diff --git a/SDL2-2.30.8/include/SDL_hints.h b/SDL2-2.30.9/include/SDL_hints.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_hints.h
rename to SDL2-2.30.9/include/SDL_hints.h
diff --git a/SDL2-2.30.8/include/SDL_joystick.h b/SDL2-2.30.9/include/SDL_joystick.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_joystick.h
rename to SDL2-2.30.9/include/SDL_joystick.h
diff --git a/SDL2-2.30.8/include/SDL_keyboard.h b/SDL2-2.30.9/include/SDL_keyboard.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_keyboard.h
rename to SDL2-2.30.9/include/SDL_keyboard.h
diff --git a/SDL2-2.30.8/include/SDL_keycode.h b/SDL2-2.30.9/include/SDL_keycode.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_keycode.h
rename to SDL2-2.30.9/include/SDL_keycode.h
diff --git a/SDL2-2.30.8/include/SDL_loadso.h b/SDL2-2.30.9/include/SDL_loadso.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_loadso.h
rename to SDL2-2.30.9/include/SDL_loadso.h
diff --git a/SDL2-2.30.8/include/SDL_locale.h b/SDL2-2.30.9/include/SDL_locale.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_locale.h
rename to SDL2-2.30.9/include/SDL_locale.h
diff --git a/SDL2-2.30.8/include/SDL_log.h b/SDL2-2.30.9/include/SDL_log.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_log.h
rename to SDL2-2.30.9/include/SDL_log.h
diff --git a/SDL2-2.30.8/include/SDL_main.h b/SDL2-2.30.9/include/SDL_main.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_main.h
rename to SDL2-2.30.9/include/SDL_main.h
diff --git a/SDL2-2.30.8/include/SDL_messagebox.h b/SDL2-2.30.9/include/SDL_messagebox.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_messagebox.h
rename to SDL2-2.30.9/include/SDL_messagebox.h
diff --git a/SDL2-2.30.8/include/SDL_metal.h b/SDL2-2.30.9/include/SDL_metal.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_metal.h
rename to SDL2-2.30.9/include/SDL_metal.h
diff --git a/SDL2-2.30.8/include/SDL_misc.h b/SDL2-2.30.9/include/SDL_misc.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_misc.h
rename to SDL2-2.30.9/include/SDL_misc.h
diff --git a/SDL2-2.30.8/include/SDL_mouse.h b/SDL2-2.30.9/include/SDL_mouse.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_mouse.h
rename to SDL2-2.30.9/include/SDL_mouse.h
diff --git a/SDL2-2.30.8/include/SDL_mutex.h b/SDL2-2.30.9/include/SDL_mutex.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_mutex.h
rename to SDL2-2.30.9/include/SDL_mutex.h
diff --git a/SDL2-2.30.8/include/SDL_name.h b/SDL2-2.30.9/include/SDL_name.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_name.h
rename to SDL2-2.30.9/include/SDL_name.h
diff --git a/SDL2-2.30.8/include/SDL_opengl.h b/SDL2-2.30.9/include/SDL_opengl.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengl.h
rename to SDL2-2.30.9/include/SDL_opengl.h
diff --git a/SDL2-2.30.8/include/SDL_opengl_glext.h b/SDL2-2.30.9/include/SDL_opengl_glext.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengl_glext.h
rename to SDL2-2.30.9/include/SDL_opengl_glext.h
diff --git a/SDL2-2.30.8/include/SDL_opengles.h b/SDL2-2.30.9/include/SDL_opengles.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles.h
rename to SDL2-2.30.9/include/SDL_opengles.h
diff --git a/SDL2-2.30.8/include/SDL_opengles2.h b/SDL2-2.30.9/include/SDL_opengles2.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles2.h
rename to SDL2-2.30.9/include/SDL_opengles2.h
diff --git a/SDL2-2.30.8/include/SDL_opengles2_gl2.h b/SDL2-2.30.9/include/SDL_opengles2_gl2.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles2_gl2.h
rename to SDL2-2.30.9/include/SDL_opengles2_gl2.h
diff --git a/SDL2-2.30.8/include/SDL_opengles2_gl2ext.h b/SDL2-2.30.9/include/SDL_opengles2_gl2ext.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles2_gl2ext.h
rename to SDL2-2.30.9/include/SDL_opengles2_gl2ext.h
diff --git a/SDL2-2.30.8/include/SDL_opengles2_gl2platform.h b/SDL2-2.30.9/include/SDL_opengles2_gl2platform.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles2_gl2platform.h
rename to SDL2-2.30.9/include/SDL_opengles2_gl2platform.h
diff --git a/SDL2-2.30.8/include/SDL_opengles2_khrplatform.h b/SDL2-2.30.9/include/SDL_opengles2_khrplatform.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_opengles2_khrplatform.h
rename to SDL2-2.30.9/include/SDL_opengles2_khrplatform.h
diff --git a/SDL2-2.30.8/include/SDL_pixels.h b/SDL2-2.30.9/include/SDL_pixels.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_pixels.h
rename to SDL2-2.30.9/include/SDL_pixels.h
diff --git a/SDL2-2.30.8/include/SDL_platform.h b/SDL2-2.30.9/include/SDL_platform.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_platform.h
rename to SDL2-2.30.9/include/SDL_platform.h
diff --git a/SDL2-2.30.8/include/SDL_power.h b/SDL2-2.30.9/include/SDL_power.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_power.h
rename to SDL2-2.30.9/include/SDL_power.h
diff --git a/SDL2-2.30.8/include/SDL_quit.h b/SDL2-2.30.9/include/SDL_quit.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_quit.h
rename to SDL2-2.30.9/include/SDL_quit.h
diff --git a/SDL2-2.30.8/include/SDL_rect.h b/SDL2-2.30.9/include/SDL_rect.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_rect.h
rename to SDL2-2.30.9/include/SDL_rect.h
diff --git a/SDL2-2.30.8/include/SDL_render.h b/SDL2-2.30.9/include/SDL_render.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_render.h
rename to SDL2-2.30.9/include/SDL_render.h
diff --git a/SDL2-2.30.8/include/SDL_revision.h b/SDL2-2.30.9/include/SDL_revision.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_revision.h
rename to SDL2-2.30.9/include/SDL_revision.h
diff --git a/SDL2-2.30.8/include/SDL_revision.h.cmake b/SDL2-2.30.9/include/SDL_revision.h.cmake
similarity index 100%
rename from SDL2-2.30.8/include/SDL_revision.h.cmake
rename to SDL2-2.30.9/include/SDL_revision.h.cmake
diff --git a/SDL2-2.30.8/include/SDL_rwops.h b/SDL2-2.30.9/include/SDL_rwops.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_rwops.h
rename to SDL2-2.30.9/include/SDL_rwops.h
diff --git a/SDL2-2.30.8/include/SDL_scancode.h b/SDL2-2.30.9/include/SDL_scancode.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_scancode.h
rename to SDL2-2.30.9/include/SDL_scancode.h
diff --git a/SDL2-2.30.8/include/SDL_sensor.h b/SDL2-2.30.9/include/SDL_sensor.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_sensor.h
rename to SDL2-2.30.9/include/SDL_sensor.h
diff --git a/SDL2-2.30.8/include/SDL_shape.h b/SDL2-2.30.9/include/SDL_shape.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_shape.h
rename to SDL2-2.30.9/include/SDL_shape.h
diff --git a/SDL2-2.30.8/include/SDL_stdinc.h b/SDL2-2.30.9/include/SDL_stdinc.h
similarity index 99%
rename from SDL2-2.30.8/include/SDL_stdinc.h
rename to SDL2-2.30.9/include/SDL_stdinc.h
index 8113f453f3..8eb757957d 100644
--- a/SDL2-2.30.8/include/SDL_stdinc.h
+++ b/SDL2-2.30.9/include/SDL_stdinc.h
@@ -257,7 +257,7 @@ typedef uint64_t Uint64;
 #define SDL_PRIs64 "I64d"
 #elif defined(PRIs64)
 #define SDL_PRIs64 PRIs64
-#elif defined(__LP64__) && !defined(__APPLE__)
+#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
 #define SDL_PRIs64 "ld"
 #else
 #define SDL_PRIs64 "lld"
diff --git a/SDL2-2.30.8/include/SDL_surface.h b/SDL2-2.30.9/include/SDL_surface.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_surface.h
rename to SDL2-2.30.9/include/SDL_surface.h
diff --git a/SDL2-2.30.8/include/SDL_system.h b/SDL2-2.30.9/include/SDL_system.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_system.h
rename to SDL2-2.30.9/include/SDL_system.h
diff --git a/SDL2-2.30.8/include/SDL_syswm.h b/SDL2-2.30.9/include/SDL_syswm.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_syswm.h
rename to SDL2-2.30.9/include/SDL_syswm.h
diff --git a/SDL2-2.30.8/include/SDL_test.h b/SDL2-2.30.9/include/SDL_test.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test.h
rename to SDL2-2.30.9/include/SDL_test.h
diff --git a/SDL2-2.30.8/include/SDL_test_assert.h b/SDL2-2.30.9/include/SDL_test_assert.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_assert.h
rename to SDL2-2.30.9/include/SDL_test_assert.h
diff --git a/SDL2-2.30.8/include/SDL_test_common.h b/SDL2-2.30.9/include/SDL_test_common.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_common.h
rename to SDL2-2.30.9/include/SDL_test_common.h
diff --git a/SDL2-2.30.8/include/SDL_test_compare.h b/SDL2-2.30.9/include/SDL_test_compare.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_compare.h
rename to SDL2-2.30.9/include/SDL_test_compare.h
diff --git a/SDL2-2.30.8/include/SDL_test_crc32.h b/SDL2-2.30.9/include/SDL_test_crc32.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_crc32.h
rename to SDL2-2.30.9/include/SDL_test_crc32.h
diff --git a/SDL2-2.30.8/include/SDL_test_font.h b/SDL2-2.30.9/include/SDL_test_font.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_font.h
rename to SDL2-2.30.9/include/SDL_test_font.h
diff --git a/SDL2-2.30.8/include/SDL_test_fuzzer.h b/SDL2-2.30.9/include/SDL_test_fuzzer.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_fuzzer.h
rename to SDL2-2.30.9/include/SDL_test_fuzzer.h
diff --git a/SDL2-2.30.8/include/SDL_test_harness.h b/SDL2-2.30.9/include/SDL_test_harness.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_harness.h
rename to SDL2-2.30.9/include/SDL_test_harness.h
diff --git a/SDL2-2.30.8/include/SDL_test_images.h b/SDL2-2.30.9/include/SDL_test_images.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_images.h
rename to SDL2-2.30.9/include/SDL_test_images.h
diff --git a/SDL2-2.30.8/include/SDL_test_log.h b/SDL2-2.30.9/include/SDL_test_log.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_log.h
rename to SDL2-2.30.9/include/SDL_test_log.h
diff --git a/SDL2-2.30.8/include/SDL_test_md5.h b/SDL2-2.30.9/include/SDL_test_md5.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_md5.h
rename to SDL2-2.30.9/include/SDL_test_md5.h
diff --git a/SDL2-2.30.8/include/SDL_test_memory.h b/SDL2-2.30.9/include/SDL_test_memory.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_memory.h
rename to SDL2-2.30.9/include/SDL_test_memory.h
diff --git a/SDL2-2.30.8/include/SDL_test_random.h b/SDL2-2.30.9/include/SDL_test_random.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_test_random.h
rename to SDL2-2.30.9/include/SDL_test_random.h
diff --git a/SDL2-2.30.8/include/SDL_thread.h b/SDL2-2.30.9/include/SDL_thread.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_thread.h
rename to SDL2-2.30.9/include/SDL_thread.h
diff --git a/SDL2-2.30.8/include/SDL_timer.h b/SDL2-2.30.9/include/SDL_timer.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_timer.h
rename to SDL2-2.30.9/include/SDL_timer.h
diff --git a/SDL2-2.30.8/include/SDL_touch.h b/SDL2-2.30.9/include/SDL_touch.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_touch.h
rename to SDL2-2.30.9/include/SDL_touch.h
diff --git a/SDL2-2.30.8/include/SDL_types.h b/SDL2-2.30.9/include/SDL_types.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_types.h
rename to SDL2-2.30.9/include/SDL_types.h
diff --git a/SDL2-2.30.8/include/SDL_version.h b/SDL2-2.30.9/include/SDL_version.h
similarity index 99%
rename from SDL2-2.30.8/include/SDL_version.h
rename to SDL2-2.30.9/include/SDL_version.h
index dc8a254fa4..fb79785fc9 100644
--- a/SDL2-2.30.8/include/SDL_version.h
+++ b/SDL2-2.30.9/include/SDL_version.h
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   30
-#define SDL_PATCHLEVEL      8
+#define SDL_PATCHLEVEL      9
 
 /**
  * Macro to determine SDL version program was compiled against.
diff --git a/SDL2-2.30.8/include/SDL_video.h b/SDL2-2.30.9/include/SDL_video.h
similarity index 100%
rename from SDL2-2.30.8/include/SDL_video.h
rename to SDL2-2.30.9/include/SDL_video.h
diff --git a/SDL2-2.30.8/include/SDL_vulkan.h b/SDL2-2.30.9/include/SDL_vulkan.h
similarity index 98%
rename from SDL2-2.30.8/include/SDL_vulkan.h
rename to SDL2-2.30.9/include/SDL_vulkan.h
index ab86a0b865..a506ef456c 100644
--- a/SDL2-2.30.8/include/SDL_vulkan.h
+++ b/SDL2-2.30.9/include/SDL_vulkan.h
@@ -52,6 +52,10 @@ extern "C" {
 VK_DEFINE_HANDLE(VkInstance)
 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
 
+/* Make sure to undef to avoid issues in case of later vulkan include */
+#undef VK_DEFINE_HANDLE
+#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
+
 #endif /* !NO_SDL_VULKAN_TYPEDEFS */
 
 typedef VkInstance SDL_vulkanInstance;
diff --git a/SDL2-2.30.8/include/begin_code.h b/SDL2-2.30.9/include/begin_code.h
similarity index 100%
rename from SDL2-2.30.8/include/begin_code.h
rename to SDL2-2.30.9/include/begin_code.h
diff --git a/SDL2-2.30.8/include/close_code.h b/SDL2-2.30.9/include/close_code.h
similarity index 100%
rename from SDL2-2.30.8/include/close_code.h
rename to SDL2-2.30.9/include/close_code.h
diff --git a/SDL2-2.30.8/lib/x64/SDL2.dll b/SDL2-2.30.9/lib/x64/SDL2.dll
similarity index 58%
rename from SDL2-2.30.8/lib/x64/SDL2.dll
rename to SDL2-2.30.9/lib/x64/SDL2.dll
index cebf26ff5b..de861a4204 100644
Binary files a/SDL2-2.30.8/lib/x64/SDL2.dll and b/SDL2-2.30.9/lib/x64/SDL2.dll differ
diff --git a/SDL2-2.30.8/lib/x64/SDL2.lib b/SDL2-2.30.9/lib/x64/SDL2.lib
similarity index 99%
rename from SDL2-2.30.8/lib/x64/SDL2.lib
rename to SDL2-2.30.9/lib/x64/SDL2.lib
index cee536c1f0..7af858c46b 100644
Binary files a/SDL2-2.30.8/lib/x64/SDL2.lib and b/SDL2-2.30.9/lib/x64/SDL2.lib differ
diff --git a/SDL2-2.30.8/lib/x64/SDL2main.lib b/SDL2-2.30.9/lib/x64/SDL2main.lib
similarity index 93%
rename from SDL2-2.30.8/lib/x64/SDL2main.lib
rename to SDL2-2.30.9/lib/x64/SDL2main.lib
index 402b4c75af..33b5c3c81f 100644
Binary files a/SDL2-2.30.8/lib/x64/SDL2main.lib and b/SDL2-2.30.9/lib/x64/SDL2main.lib differ
diff --git a/SDL2-2.30.8/lib/x64/SDL2test.lib b/SDL2-2.30.9/lib/x64/SDL2test.lib
similarity index 95%
rename from SDL2-2.30.8/lib/x64/SDL2test.lib
rename to SDL2-2.30.9/lib/x64/SDL2test.lib
index 4e4f7c5e4d..d498ed6984 100644
Binary files a/SDL2-2.30.8/lib/x64/SDL2test.lib and b/SDL2-2.30.9/lib/x64/SDL2test.lib differ
diff --git a/SDL2-2.30.8/lib/x86/SDL2.dll b/SDL2-2.30.9/lib/x86/SDL2.dll
similarity index 54%
rename from SDL2-2.30.8/lib/x86/SDL2.dll
rename to SDL2-2.30.9/lib/x86/SDL2.dll
index 3b994ad4dd..431ca7e539 100644
Binary files a/SDL2-2.30.8/lib/x86/SDL2.dll and b/SDL2-2.30.9/lib/x86/SDL2.dll differ
diff --git a/SDL2-2.30.8/lib/x86/SDL2.lib b/SDL2-2.30.9/lib/x86/SDL2.lib
similarity index 99%
rename from SDL2-2.30.8/lib/x86/SDL2.lib
rename to SDL2-2.30.9/lib/x86/SDL2.lib
index f7f8d2c25d..2ee26f15c8 100644
Binary files a/SDL2-2.30.8/lib/x86/SDL2.lib and b/SDL2-2.30.9/lib/x86/SDL2.lib differ
diff --git a/SDL2-2.30.8/lib/x86/SDL2main.lib b/SDL2-2.30.9/lib/x86/SDL2main.lib
similarity index 87%
rename from SDL2-2.30.8/lib/x86/SDL2main.lib
rename to SDL2-2.30.9/lib/x86/SDL2main.lib
index 93a5291b24..2bf4d71cb6 100644
Binary files a/SDL2-2.30.8/lib/x86/SDL2main.lib and b/SDL2-2.30.9/lib/x86/SDL2main.lib differ
diff --git a/SDL2-2.30.8/lib/x86/SDL2test.lib b/SDL2-2.30.9/lib/x86/SDL2test.lib
similarity index 94%
rename from SDL2-2.30.8/lib/x86/SDL2test.lib
rename to SDL2-2.30.9/lib/x86/SDL2test.lib
index 04ee8a75c6..1ed04badb6 100644
Binary files a/SDL2-2.30.8/lib/x86/SDL2test.lib and b/SDL2-2.30.9/lib/x86/SDL2test.lib differ
diff --git a/msvc/Debug/SDL2.dll b/msvc/Debug/SDL2.dll
index 3b994ad4dd..431ca7e539 100644
Binary files a/msvc/Debug/SDL2.dll and b/msvc/Debug/SDL2.dll differ
diff --git a/msvc/Release/SDL2.dll b/msvc/Release/SDL2.dll
index 3b994ad4dd..431ca7e539 100644
Binary files a/msvc/Release/SDL2.dll and b/msvc/Release/SDL2.dll differ
diff --git a/msvc/doomretro.vcxproj b/msvc/doomretro.vcxproj
index 3d17ee5040..89bc6b0fb1 100644
--- a/msvc/doomretro.vcxproj
+++ b/msvc/doomretro.vcxproj
@@ -106,7 +106,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -131,7 +131,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateMapFile>false</GenerateMapFile>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.8\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <SuppressStartupBanner>false</SuppressStartupBanner>
@@ -147,7 +147,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -172,7 +172,7 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateMapFile>false</GenerateMapFile>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.8\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <SuppressStartupBanner>false</SuppressStartupBanner>
@@ -189,7 +189,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -239,7 +239,7 @@
       <EnableUAC>false</EnableUAC>
       <GenerateMapFile>true</GenerateMapFile>
       <MapExports>false</MapExports>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.8\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
@@ -256,7 +256,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -306,7 +306,7 @@
       <EnableUAC>false</EnableUAC>
       <GenerateMapFile>true</GenerateMapFile>
       <MapExports>false</MapExports>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.8\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
diff --git a/msvc/x64/Debug/SDL2.dll b/msvc/x64/Debug/SDL2.dll
index cebf26ff5b..de861a4204 100644
Binary files a/msvc/x64/Debug/SDL2.dll and b/msvc/x64/Debug/SDL2.dll differ
diff --git a/msvc/x64/Release/SDL2.dll b/msvc/x64/Release/SDL2.dll
index cebf26ff5b..de861a4204 100644
Binary files a/msvc/x64/Release/SDL2.dll and b/msvc/x64/Release/SDL2.dll differ
diff --git a/releasenotes.md b/releasenotes.md
index cb3415b01c..ded70d90f8 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -3,7 +3,7 @@
 ### DOOM Retro v5.6
 
 * *DOOM Retro* is now built using v17.11.5 of [*Microsoft Visual Studio Community 2022*](https://visualstudio.microsoft.com/vs/community/).
-* *DOOM Retro* now uses [*SDL v2.30.8*](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.8).
+* *DOOM Retro* now uses [*SDL v2.30.9*](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.8).
 * Several changes have been made to further improve the overall performance and stability of *DOOM Retro*.
 * Minor changes have been made to text that is output to the console.
 * Minor improvements have been made to text autocompleted in the console by pressing the <kbd><b>TAB</b></kbd> key.