diff --git a/.gitmodules b/.gitmodules
index 4f8d2a17..00dc232c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "folly"]
 	path = folly
-	url = https://github.com/mhx/folly
+	url = https://github.com/facebook/folly
 [submodule "fbthrift"]
 	path = fbthrift
 	url = https://github.com/facebook/fbthrift
diff --git a/fbthrift b/fbthrift
index eeb175ae..fbfab6c2 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit eeb175ae401943d897d20d66fbc2f17d3aff23ae
+Subproject commit fbfab6c247cc541c456fbad4917c0517e876c9e1
diff --git a/folly b/folly
index cb9803db..174eed98 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit cb9803db041c662c8ac84710cf0caa1edb69cdf9
+Subproject commit 174eed980e5d5db2612315e0386e155fc3397f2c