diff --git a/.gitmodules b/.gitmodules
index 3170252c..5a2b776d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,3 +17,6 @@
 [submodule "deps/libuv"]
 	path = deps/libuv
 	url = https://github.com/libuv/libuv.git
+[submodule "deps/picohttpparser"]
+	path = deps/picohttpparser
+	url = https://github.com/h2o/picohttpparser.git
diff --git a/deps/picohttpparser b/deps/picohttpparser
new file mode 160000
index 00000000..4e7bc76f
--- /dev/null
+++ b/deps/picohttpparser
@@ -0,0 +1 @@
+Subproject commit 4e7bc76fa7693da738c20034374393154ef2d75b