diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..f15e6788
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/msquic"]
+	path = submodules/msquic
+	url = https://github.com/microsoft/msquic.git
diff --git a/get-msquic.sh b/get-msquic.sh
index 910ae6b1..efe862cf 100755
--- a/get-msquic.sh
+++ b/get-msquic.sh
@@ -36,9 +36,16 @@ patch_2_3_5()
     do_patch "$patch_1"
 }
 
-
 if [ ! -d msquic ]; then
-    git clone https://github.com/microsoft/msquic.git -b "$VERSION" --recursive --depth 1 --shallow-submodules msquic
+    if [ -f submodules/msquic/.git ]; then
+        pushd submodules/msquic
+        git checkout "$VERSION"
+        popd
+        rm -f msquic
+        ln -s submodules/msquic msquic
+    else
+        git clone https://github.com/microsoft/msquic.git -b "$VERSION" --recursive --depth 1 --shallow-submodules msquic
+    fi
 fi
 
 cd msquic
diff --git a/submodules/msquic b/submodules/msquic
new file mode 160000
index 00000000..a09a6de2
--- /dev/null
+++ b/submodules/msquic
@@ -0,0 +1 @@
+Subproject commit a09a6de23d724dc7cae9b5bf9dfb82205331a59a