diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
index 5cac095d93..213c242068 100644
--- a/cmake/configs/default.cmake
+++ b/cmake/configs/default.cmake
@@ -144,7 +144,7 @@ hunter_default_version(RapidJSON VERSION 1.1.0-b557259-p0)
 hunter_default_version(RapidXML VERSION 1.13)
 hunter_default_version(RedisClient VERSION 0.6.1-p1)
 hunter_default_version(SDL2 VERSION 2.0.12-p0)
-hunter_default_version(SDL_image VERSION 2.0.1-p1)
+hunter_default_version(SDL_image VERSION 2.0.5-p0)
 hunter_default_version(SDL_mixer VERSION 2.0.2-p0)
 hunter_default_version(SDL_ttf VERSION 2.0.14-p0)
 hunter_default_version(SFML VERSION 2.5.1-p0)
diff --git a/cmake/projects/SDL_image/hunter.cmake b/cmake/projects/SDL_image/hunter.cmake
index b6d93d1658..dbd5b20907 100644
--- a/cmake/projects/SDL_image/hunter.cmake
+++ b/cmake/projects/SDL_image/hunter.cmake
@@ -6,15 +6,26 @@ include(hunter_download)
 include(hunter_pick_scheme)
 include(hunter_cacheable)
 
+hunter_add_version(
+        PACKAGE_NAME
+        SDL_image
+        VERSION
+        "2.0.5-p0"
+        URL
+        "https://github.com/cpp-pm/SDL_image/archive/v2.0.5-p0.tar.gz"
+        SHA1
+        7c93e53ad122364bb934e90dac265d88f768a4ed
+)
+
 hunter_add_version(
         PACKAGE_NAME
         SDL_image
         VERSION
         "2.0.1-p1"
         URL
-        "https://github.com/hunter-packages/SDL_image_cmake/archive/2.0.1-p1.tar.gz"
+        "https://github.com/cpp-pm/SDL_image_cmake_legacy/archive/2.0.1-p1.tar.gz"
         SHA1
-        8f644d026256f48f0e2ba5411422eaf2a91c0463
+        a36f0617b0d22e9960ef931b43ecbcb6a9df165f
 )
 
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
diff --git a/docs/packages/pkg/SDL_image.rst b/docs/packages/pkg/SDL_image.rst
index fd0f1892c8..ae602d4d44 100644
--- a/docs/packages/pkg/SDL_image.rst
+++ b/docs/packages/pkg/SDL_image.rst
@@ -10,7 +10,7 @@ SDL_image
 =========
 
 -  `Official <https://www.libsdl.org/projects/SDL_image/>`__
--  `Hunterized <https://github.com/hunter-packages/SDL_image_cmake/>`__
+-  `Hunterized <https://github.com/cpp-pm/SDL_image/>`__
 -  `Example <https://github.com/cpp-pm/hunter/blob/master/examples/SDL_image/CMakeLists.txt>`__
 -  Available since `v0.19.86 <https://github.com/cpp-pm/hunter/releases/tag/v0.19.86>`__
 -  Added by `wheybags <https://github.com/wheybags>`__ (`pr-989 <https://github.com/ruslo/hunter/pull/989>`__)
diff --git a/examples/SDL_image/CMakeLists.txt b/examples/SDL_image/CMakeLists.txt
index 92b75c20ba..9c51426e2b 100644
--- a/examples/SDL_image/CMakeLists.txt
+++ b/examples/SDL_image/CMakeLists.txt
@@ -9,7 +9,20 @@ project(SDL_image-test)
 hunter_add_package(SDL_image)
 find_package(SDL_image CONFIG REQUIRED)
 
-add_executable(main main.cpp)
+if(ANDROID)
+  add_library(main SHARED main.cpp)
+else()
+  add_executable(main main.cpp)
+endif()
+
+# Fix MinGW / MSYS build
+if(MINGW OR MSYS)
+target_link_libraries(main
+    mingw32
+)
+endif()
+
 target_link_libraries(main
     SDL_image::SDL_image
-    SDL2::SDL2main)
+    SDL2::SDL2main
+    SDL2::SDL2)