diff --git a/.gitmodules b/.gitmodules
index 69251ecb..424eb810 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "tools/libs/apple_pie"]
 	path = tools/libs/apple_pie
 	url = https://github.com/Luukdegram/apple_pie
+[submodule "glfw/upstream"]
+	path = glfw/upstream
+	url = https://github.com/hexops/glfw
diff --git a/glfw/.gitmodules b/glfw/.gitmodules
new file mode 100644
index 00000000..bd2b0a89
--- /dev/null
+++ b/glfw/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "glfw/upstream"]
+	path = glfw/upstream
+	url = https://github.com/hexops/glfw
+
diff --git a/glfw/upstream b/glfw/upstream
new file mode 160000
index 00000000..daa69f32
--- /dev/null
+++ b/glfw/upstream
@@ -0,0 +1 @@
+Subproject commit daa69f32e9a8ec20492b24d79b9243cb7ddf1aa8