diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49eae3a29fb90..1afe6b62c3b24 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,8 +48,20 @@ if (TILES)
                 ${MESSAGES_CPP}
                 ${RESOURCE_RC})
         if(MSYS2)
-            target_link_options(cataclysm-tiles PRIVATE
-                "$<$<CONFIG:Debug,RelWithDebInfo>:LINKER:--strip-debug>"
+            set(_KEEP $<$<CONFIG:RelWithDebInfo,Debug>:objcopy
+            --only-keep-debug
+            $<TARGET_FILE:cataclysm-tiles>
+            $<TARGET_FILE:cataclysm-tiles>.debug
+            >)
+            set(_STRIP $<$<CONFIG:RelWithDebInfo,Debug>:objcopy
+            --strip-unneeded
+            --add-gnu-debuglink=$<TARGET_FILE:cataclysm-tiles>.debug
+            $<TARGET_FILE:cataclysm-tiles>
+            >)
+            add_custom_command(TARGET cataclysm-tiles POST_BUILD
+                COMMAND "${_KEEP}"
+                COMMAND "${_STRIP}"
+                COMMAND_EXPAND_LISTS
             )
         else()
             # Use only our RT_MANIFEST from resource.rc