diff --git a/.gitmodules b/.gitmodules
index f4a19857..0b5b4004 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "data"]
 	path = data
 	url = git://github.com/colobot/colobot-data.git
+	branch = .
+	update = rebase
 [submodule "lib/googletest"]
 	path = lib/googletest
 	url = git://github.com/google/googletest.git
+	ignore = all
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4dd5808..96b534a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,11 +439,12 @@ endif()
 
 if(TESTS)
     # Google Test library
-    find_package(GTest 1.10.0 QUIET)
+    find_package(GTest 1.11.0 QUIET)
     if(NOT(FORCE_BUNDLED_GTEST) AND GTEST_FOUND)
         message(STATUS "Using system gtest library in ${GTEST_BOTH_LIBRARIES}")
     elseif(EXISTS "${colobot_SOURCE_DIR}/lib/googletest/googletest/CMakeLists.txt")
         message(STATUS "Using gtest git submodule")
+        set(GOOGLETEST_VERSION "1.11.0")
         add_subdirectory("${colobot_SOURCE_DIR}/lib/googletest/googletest" "lib/googletest/googletest")
         # Add aliases so target names are compatible with the find_package above
         add_library(GTest::GTest ALIAS gtest)
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index cd73f293..2445d36e 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -317,8 +317,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
 if(SDL2MAIN_LIBRARY)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
                                     REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
-                                    VERSION_VAR SDL2_VERSION_STRING
-                                    NAME_MISMATCHED)
+                                    VERSION_VAR SDL2_VERSION_STRING)
 endif()
 
 
diff --git a/data b/data
index 21a45c0b..5d658744 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 21a45c0b8809accd142a83a81f1a3c92a327f319
+Subproject commit 5d658744641064e56cf489453dbf726964b2b98d
diff --git a/lib/googletest b/lib/googletest
index 703bd9ca..e2239ee6 160000
--- a/lib/googletest
+++ b/lib/googletest
@@ -1 +1 @@
-Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e
+Subproject commit e2239ee6043f73722e7aa812a459f54a28552929