diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa19fc2b0..fe92d4086 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,11 @@
-cmake_minimum_required(VERSION 3.13) # CMP0083 NEW
+cmake_minimum_required(VERSION 3.13)
+
+if(POLICY CMP0083)
+  cmake_policy(SET CMP0083 NEW)
+endif()
+if(POLICY CMP0111)
+  cmake_policy(SET CMP0111 NEW)
+endif()
 
 include(CMakeDependentOption)
 include(CMake/out_of_tree.cmake)
diff --git a/Packaging/windows/mingw-prep.sh b/Packaging/windows/mingw-prep.sh
index 5bd4d1f46..7781c96f7 100755
--- a/Packaging/windows/mingw-prep.sh
+++ b/Packaging/windows/mingw-prep.sh
@@ -3,6 +3,8 @@
 # exit when any command fails
 set -euo pipefail
 
+MINGW_PREFIX=/usr/i686-w64-mingw32/
+
 wget https://www.libsdl.org/release/SDL2-devel-2.0.14-mingw.tar.gz
 tar -xzf SDL2-devel-2.0.14-mingw.tar.gz
 wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.15-mingw.tar.gz
@@ -15,5 +17,19 @@ sudo cp -r libsodium-win32/* /usr/i686-w64-mingw32
 sudo cp -r SDL2*/i686-w64-mingw32 /usr
 
 # Fixup pkgconfig prefix:
-find "/usr/i686-w64-mingw32/lib/pkgconfig/" -name '*.pc' -exec \
-  sed -i "s|^prefix=.*|prefix=/usr/i686-w64-mingw32|" '{}' \;
+find "${MINGW_PREFIX}/lib/pkgconfig/" -name '*.pc' -exec \
+  sed -i "s|^prefix=.*|prefix=${MINGW_PREFIX}|" '{}' \;
+
+# Fixup CMake prefix:
+find "$MINGW_PREFIX" -name '*.cmake' -exec \
+  sed -i "s|/opt/local/i686-w64-mingw32|${MINGW_PREFIX}|" '{}' \;
+
+# Fixup SDL2's cmake file
+# See https://github.com/libsdl-org/SDL/issues/3665
+sed "s|@prefix@|${MINGW_PREFIX}|;
+s|@exec_prefix@|\${prefix}|;
+s|@libdir@|\${exec_prefix}/lib|;
+s|@includedir@|\${prefix}/include|;
+s|@SDL_RLD_FLAGS@||;
+s|@SDL_LIBS@||;
+" "$(dirname "$0")"/sdl2-config.cmake.in > "${MINGW_PREFIX}/lib/cmake/SDL2/sdl2-config.cmake"
diff --git a/Packaging/windows/mingw-prep64.sh b/Packaging/windows/mingw-prep64.sh
index 434a542df..289d2cd78 100755
--- a/Packaging/windows/mingw-prep64.sh
+++ b/Packaging/windows/mingw-prep64.sh
@@ -3,6 +3,8 @@
 # exit when any command fails
 set -euo pipefail
 
+MINGW_PREFIX=/usr/x86_64-w64-mingw32/
+
 wget https://www.libsdl.org/release/SDL2-devel-2.0.14-mingw.tar.gz
 tar -xzf SDL2-devel-2.0.14-mingw.tar.gz
 wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.15-mingw.tar.gz
@@ -15,5 +17,19 @@ sudo cp -r libsodium-win64/* /usr/x86_64-w64-mingw32
 sudo cp -r SDL2*/x86_64-w64-mingw32 /usr
 
 # Fixup pkgconfig prefix:
-find "/usr/x86_64-w64-mingw32/lib/pkgconfig/" -name '*.pc' -exec \
-  sed -i "s|^prefix=.*|prefix=/usr/x86_64-w64-mingw32|" '{}' \;
+find "${MINGW_PREFIX}/lib/pkgconfig/" -name '*.pc' -exec \
+  sed -i "s|^prefix=.*|prefix=${MINGW_PREFIX}|" '{}' \;
+
+# Fixup CMake prefix:
+find "$MINGW_PREFIX" -name '*.cmake' -exec \
+  sed -i "s|/opt/local/x86_64-w64-mingw32|${MINGW_PREFIX}|" '{}' \;
+
+# Fixup SDL2's cmake file
+# See https://github.com/libsdl-org/SDL/issues/3665
+sed "s|@prefix@|${MINGW_PREFIX}|;
+s|@exec_prefix@|\${prefix}|;
+s|@libdir@|\${exec_prefix}/lib|;
+s|@includedir@|\${prefix}/include|;
+s|@SDL_RLD_FLAGS@||;
+s|@SDL_LIBS@||;
+" "$(dirname "$0")"/sdl2-config.cmake.in > "${MINGW_PREFIX}/lib/cmake/SDL2/sdl2-config.cmake"
diff --git a/Packaging/windows/sdl2-config.cmake.in b/Packaging/windows/sdl2-config.cmake.in
new file mode 100644
index 000000000..d71cea044
--- /dev/null
+++ b/Packaging/windows/sdl2-config.cmake.in
@@ -0,0 +1,83 @@
+# We copy this for mingw builds to work around https://github.com/libsdl-org/SDL/issues/3665
+# Taken from https://github.com/libsdl-org/SDL/pull/4320
+# sdl2 cmake project-config input for ./configure scripts
+
+set(prefix "@prefix@")
+set(exec_prefix "@exec_prefix@")
+set(libdir "@libdir@")
+set(includedir "@includedir@")
+set(SDL2_PREFIX "${prefix}")
+set(SDL2_EXEC_PREFIX "${exec_prefix}")
+set(SDL2_LIBDIR "${libdir}")
+set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")
+set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
+string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
+
+if(NOT TARGET SDL2::SDL2)
+  # provide SDL2::SDL2, SDL2::SDL2main and SDL2::SDL2-static targets, like SDL2Config.cmake does, for compatibility
+
+  # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main
+  # This may require "libdir" beeing set (from above)
+  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS "@SDL_RLD_FLAGS@ @SDL_LIBS@ ")
+  # also get rid of -lSDL2main, if you want to link against that use both SDL2::SDL2main and SDL2::SDL2 (in that order)
+  # (SDL2Config.cmake has the same behavior)
+  string(REPLACE "-lSDL2main" "" SDL2_EXTRA_LINK_FLAGS ${SDL2_EXTRA_LINK_FLAGS})
+  string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS)
+  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_STATIC_LIBS@ ")
+  string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC)
+
+if(WIN32 AND NOT MSVC)
+  # MINGW needs very special handling, because the link order must be exactly -lmingw32 -lSDL2main -lSDL2 -mwindows
+  # for it to work at all; a normal SHARED IMPORTED or STATIC IMPORTED library always puts itself first
+  # so handle this like a header-only lib and put everything in INTERFACE_LINK_LIBRARIES
+
+  add_library(SDL2::SDL2 INTERFACE IMPORTED)
+  set_target_properties(SDL2::SDL2 PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2 -mwindows")
+
+  add_library(SDL2::SDL2main INTERFACE IMPORTED)
+  set_target_properties(SDL2::SDL2main PROPERTIES
+    INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main")
+
+else() # (not WIN32) or MSVC
+
+  add_library(SDL2::SDL2 SHARED IMPORTED)
+  set_target_properties(SDL2::SDL2 PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}")
+
+  if(MSVC)
+    # This file is generated when building SDL2 with autotools and MinGW, and MinGW/dlltool
+    # isn't able to generate .lib files that are usable by recent MSVC versions
+    # (something about "module unsafe for SAFESEH"; SAFESEH is enabled by default in MSVC).
+    # The .lib file for SDL2.dll *could* be generated with `gendef SDL2.dll` and then
+    # `lib.exe /machine:x86 /def:SDL2.def /out:SDL2.lib` (or /machine:amd64)
+    # but that requires lib.exe from a Visual Studio installation - and that still doesn't
+    # give you a static SDL2main.lib that you'll most probably need (unless you don't use SDL2main)
+    # Note that when building SDL2 with CMake and MSVC, the result works with both MinGW and MSVC.
+
+    message(FATAL_ERROR, "This build of libSDL2 only supports MinGW, not MSVC (Visual C++), because it lacks .lib files!")
+    # MSVC needs SDL2.lib set as IMPORTED_IMPLIB to link against (comment out message() call above if you added SDL2.lib yourself)
+    set_target_properties(SDL2::SDL2 PROPERTIES IMPORTED_IMPLIB "${SDL2_LIBDIR}/SDL2.lib")
+  else()
+    # this mustn't be set for MSVC, so do it here in an extra call here
+    set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES  "${SDL2_EXTRA_LINK_FLAGS}")
+  endif()
+
+  add_library(SDL2::SDL2main STATIC IMPORTED)
+  set_target_properties(SDL2::SDL2main PROPERTIES
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+endif() # (not WIN32) or MSVC
+
+  add_library(SDL2::SDL2-static STATIC IMPORTED)
+  set_target_properties(SDL2::SDL2-static PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}")
+
+endif() # NOT TARGET SDL2::SDL2