diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh
index 27815f349..08d01da44 100644
--- a/util/buildbot/common.sh
+++ b/util/buildbot/common.sh
@@ -88,7 +88,7 @@ add_cmake_libs () {
 		-DJPEG_INCLUDE_DIR=$libdir/libjpeg/include
 		-DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)"
 
-		-DCMAKE_PREFIX_PATH=$libdir/sdl2/lib/cmake
+		-DSDL2_DIR=$libdir/sdl2/lib/cmake/SDL2
 		-DSDL2_DLL="$(_dlls $libdir/sdl2/bin/*)"
 
 		-DZLIB_INCLUDE_DIR=$libdir/zlib/include
diff --git a/util/buildbot/toolchain_i686-w64-mingw32.cmake b/util/buildbot/toolchain_i686-w64-mingw32.cmake
index 015682394..a8649ec51 100644
--- a/util/buildbot/toolchain_i686-w64-mingw32.cmake
+++ b/util/buildbot/toolchain_i686-w64-mingw32.cmake
@@ -15,3 +15,4 @@ SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
index 113cc0e78..d09322bae 100644
--- a/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
+++ b/util/buildbot/toolchain_x86_64-w64-mingw32.cmake
@@ -15,3 +15,4 @@ SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)