diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6b714ef9..eb31d1ac93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -943,13 +943,18 @@ set(ZIG_RELEASE_SAFE OFF CACHE BOOL "Build Zig as ReleaseSafe (with debug assert
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   list(APPEND ZIG_BUILD_ARGS -Doptimize=Debug)
 else()
-  if(ZIG_RELEASE_SAFE)
-    list(APPEND ZIG_BUILD_ARGS -Doptimize=ReleaseSafe)
+  if("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
+    list(APPEND ZIG_BUILD_ARGS -Doptimize=ReleaseSmall)
   else()
-    list(APPEND ZIG_BUILD_ARGS -Doptimize=ReleaseFast)
-  endif()
-  if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
-    list(APPEND ZIG_BUILD_ARGS -Dstrip)
+    # Release and RelWithDebInfo
+    if(ZIG_RELEASE_SAFE)
+      list(APPEND ZIG_BUILD_ARGS -Doptimize=ReleaseSafe)
+    else()
+      list(APPEND ZIG_BUILD_ARGS -Doptimize=ReleaseFast)
+    endif()
+    if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
+      list(APPEND ZIG_BUILD_ARGS -Dstrip)
+    endif()
   endif()
 endif()