diff --git a/.gitmodules b/.gitmodules
index 78bd5b0..f45d1ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "lib/zig-toml"]
 	path = lib/zig-toml
 	url = https://github.com/aeronavery/zig-toml
+[submodule "lib/zba-gdbstub"]
+	path = lib/zba-gdbstub
+	url = https://git.musuka.dev/paoda/zba-gdbstub
diff --git a/build.zig b/build.zig
index bc1f6fc..68d03a1 100644
--- a/build.zig
+++ b/build.zig
@@ -1,6 +1,8 @@
 const std = @import("std");
 const builtin = @import("builtin");
+
 const Sdk = @import("lib/SDL.zig/Sdk.zig");
+const Gdbstub = @import("lib/zba-gdbstub/build.zig");
 
 pub fn build(b: *std.build.Builder) void {
     // Minimum Zig Version
@@ -41,6 +43,9 @@ pub fn build(b: *std.build.Builder) void {
     // OpenGL 3.3 Bindings
     exe.addPackagePath("gl", "lib/gl.zig");
 
+    // gdbstub
+    Gdbstub.link(exe);
+
     // Zig SDL Bindings: https://github.com/MasterQ32/SDL.zig
     const sdk = Sdk.init(b, null);
     sdk.link(exe, .dynamic);
diff --git a/lib/zba-gdbstub b/lib/zba-gdbstub
new file mode 160000
index 0000000..08bf0f9
--- /dev/null
+++ b/lib/zba-gdbstub
@@ -0,0 +1 @@
+Subproject commit 08bf0f9201a0cd6d317e3f73a26d245eedfd1121