diff --git a/.gitmodules b/.gitmodules
index 22cf04d2..5716e055 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,8 @@
 	url = https://github.com/nukeykt/Nuked-OPN2
 [submodule "extern/SDL"]
 	path = extern/SDL
-	url = https://github.com/spurious/SDL-mirror
-	branch = release-2.0.12
+	url = https://github.com/libsdl-org/SDL.git
+	branch = main
 [submodule "extern/Nuked-OPM"]
 	path = extern/Nuked-OPM
 	url = https://github.com/nukeykt/Nuked-OPM
diff --git a/extern/SDL b/extern/SDL
index 863c4bd2..21d46b7e 160000
--- a/extern/SDL
+++ b/extern/SDL
@@ -1 +1 @@
-Subproject commit 863c4bd26b51892864c6042ad2db474e11b08fed
+Subproject commit 21d46b7e0c59b9b0385293acc90893e879363da3
diff --git a/extern/zlib/CMakeLists.txt b/extern/zlib/CMakeLists.txt
index 0fe939df..380ca472 100644
--- a/extern/zlib/CMakeLists.txt
+++ b/extern/zlib/CMakeLists.txt
@@ -230,20 +230,20 @@ endif()
 # Example binaries
 #============================================================================
 
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
+#add_executable(example test/example.c)
+#target_link_libraries(example zlib)
+#add_test(example example)
 
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
+#add_executable(minigzip test/minigzip.c)
+#target_link_libraries(minigzip zlib)
 
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()
+#if(HAVE_OFF64_T)
+#    add_executable(example64 test/example.c)
+#    target_link_libraries(example64 zlib)
+#    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+#    add_test(example64 example64)
+#
+#    add_executable(minigzip64 test/minigzip.c)
+#    target_link_libraries(minigzip64 zlib)
+#    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+#endif()
diff --git a/extern/zlib/MODIFIED b/extern/zlib/MODIFIED
new file mode 100644
index 00000000..9ed8ea9f
--- /dev/null
+++ b/extern/zlib/MODIFIED
@@ -0,0 +1,2 @@
+THIS IS A MODIFIED VERSION OF THE ORIGINAL ZLIB LIBRARY.
+IT DISABLES BUILDING EXAMPLE APPLICATIONS AS IT TRIGGERS AN ERROR WHEN BUILDING USING MINGW.