diff --git a/.gitmodules b/.gitmodules
index 9a583b74..40b339ac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "third_party/grpc"]
 	path = third_party/grpc
 	url = git@github.com:grpc/grpc.git
-[submodule "third_party/protoc"]
-	path = third_party/protoc
-	url = git@github.com:google/protobuf.git
+[submodule "third_party/jsoncpp"]
+	path = third_party/jsoncpp
+	url = git@github.com:open-source-parsers/jsoncpp.git
diff --git a/third_party/grpc b/third_party/grpc
index ff83681c..94d57629 160000
--- a/third_party/grpc
+++ b/third_party/grpc
@@ -1 +1 @@
-Subproject commit ff83681cbb4296dba3dcd92aaba27cba494a934a
+Subproject commit 94d57629b9a2fb1ca1ec76cc3575f9ac6c595b2c
diff --git a/third_party/jsoncpp b/third_party/jsoncpp
new file mode 160000
index 00000000..6062f9b8
--- /dev/null
+++ b/third_party/jsoncpp
@@ -0,0 +1 @@
+Subproject commit 6062f9b848cadcddc5cb00b09539411a803a6914
diff --git a/third_party/protoc b/third_party/protoc
deleted file mode 160000
index 98a3734b..00000000
--- a/third_party/protoc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98a3734b5aa680f565af10a5fd4430baa4b4aa10