diff --git a/.gitmodules b/.gitmodules
index 793dcf0a0..6a4ca53b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vendor/mach"]
-	path = vendor/mach
-	url = https://github.com/hexops/mach.git
 [submodule "vendor/freetype"]
 	path = vendor/freetype
 	url = https://github.com/freetype/freetype.git
@@ -43,3 +40,6 @@
 [submodule "vendor/mach-sdk/sdk-linux-x86_64"]
 	path = vendor/mach-sdk/sdk-linux-x86_64
 	url = https://github.com/hexops/sdk-linux-x86_64.git
+[submodule "vendor/mach-glfw"]
+	path = vendor/mach-glfw
+	url = https://github.com/hexops/mach-glfw.git
diff --git a/build.zig b/build.zig
index 16b0f1b5c..a62912b62 100644
--- a/build.zig
+++ b/build.zig
@@ -4,7 +4,7 @@ const fs = std.fs;
 const LibExeObjStep = std.build.LibExeObjStep;
 const RunStep = std.build.RunStep;
 const apprt = @import("src/apprt.zig");
-const glfw = @import("vendor/mach/libs/glfw/build.zig");
+const glfw = @import("vendor/mach-glfw/build.zig");
 const fontconfig = @import("pkg/fontconfig/build.zig");
 const freetype = @import("pkg/freetype/build.zig");
 const harfbuzz = @import("pkg/harfbuzz/build.zig");
@@ -20,7 +20,7 @@ const stb_image_resize = @import("pkg/stb_image_resize/build.zig");
 const utf8proc = @import("pkg/utf8proc/build.zig");
 const zlib = @import("pkg/zlib/build.zig");
 const tracylib = @import("pkg/tracy/build.zig");
-const system_sdk = @import("vendor/mach/libs/glfw/system_sdk.zig");
+const system_sdk = @import("vendor/mach-glfw/system_sdk.zig");
 const font = @import("src/font/main.zig");
 const WasmTarget = @import("src/os/wasm/target.zig").Target;
 const LibtoolStep = @import("src/build/LibtoolStep.zig");
diff --git a/vendor/mach b/vendor/mach
deleted file mode 160000
index 60597f78d..000000000
--- a/vendor/mach
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 60597f78d8057d134fc92eed8b7762bb27a74fbf
diff --git a/vendor/mach-glfw b/vendor/mach-glfw
new file mode 160000
index 000000000..871de9334
--- /dev/null
+++ b/vendor/mach-glfw
@@ -0,0 +1 @@
+Subproject commit 871de9334926273b41c80b0fb13a74d8438eb4e7
diff --git a/vendor/zig-objc b/vendor/zig-objc
index fa7be5173..1e3537ab9 160000
--- a/vendor/zig-objc
+++ b/vendor/zig-objc
@@ -1 +1 @@
-Subproject commit fa7be5173c9bd6708b4a436be7f77f8e3e6bd43b
+Subproject commit 1e3537ab97144c5c0fe0979c12c92121912a5e89