diff --git a/.gitmodules b/.gitmodules
index 00dc232c..3e2aa015 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "folly"]
 	path = folly
-	url = https://github.com/facebook/folly
+	url = https://github.com/mhx/folly
 [submodule "fbthrift"]
 	path = fbthrift
-	url = https://github.com/facebook/fbthrift
+	url = https://github.com/mhx/fbthrift
diff --git a/fbthrift b/fbthrift
index 741b04e4..54bfd92f 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit 741b04e40fc1c2bc470e1af973d7dccd948101e5
+Subproject commit 54bfd92f0aafae55225a26b65147fa3fb4f61d2b
diff --git a/folly b/folly
index 83cad68e..16df5c09 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit 83cad68ea9bc51835926658b8816c5bde7043eab
+Subproject commit 16df5c0948b4c8aa33bbd3b191036eb8e1df85a4