diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d03a0f8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3rdparty/cpp-httplib"]
+	path = 3rdparty/cpp-httplib
+	url = git@github.com:bondagit/cpp-httplib.git
diff --git a/3rdparty/.gitignore b/3rdparty/.gitignore
index a31ccab..ab02b6f 100644
--- a/3rdparty/.gitignore
+++ b/3rdparty/.gitignore
@@ -1,3 +1 @@
 /ravenna-alsa-lkm
-/cpp-httplib
-
diff --git a/3rdparty/cpp-httplib b/3rdparty/cpp-httplib
new file mode 160000
index 0000000..42f9f91
--- /dev/null
+++ b/3rdparty/cpp-httplib
@@ -0,0 +1 @@
+Subproject commit 42f9f9107f87ad2ee04be117dbbadd621c449552
diff --git a/build.sh b/build.sh
index ed77e53..60d7d8a 100755
--- a/build.sh
+++ b/build.sh
@@ -17,14 +17,6 @@ if [ ! -d ravenna-alsa-lkm ]; then
   cd ../..
 fi
 
-if [ ! -d cpp-httplib ]; then
-  git clone https://github.com/bondagit/cpp-httplib.git
-  cd cpp-httplib
-  git checkout 42f9f9107f87ad2ee04be117dbbadd621c449552
-  cd ..
-fi
-cd ..
-
 cd webui
 echo "Downloading current webui release ..."
 wget --timestamping https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz