diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4347b755..e0dae7ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -517,6 +517,7 @@ endif()
 add_library(
   thrift_light
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/Protocol.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/BinaryProtocol.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/DebugProtocol.cpp
diff --git a/fbthrift b/fbthrift
index 954b49b1..c61f9fcb 160000
--- a/fbthrift
+++ b/fbthrift
@@ -1 +1 @@
-Subproject commit 954b49b17037fe12fdcbffadcf42c0e525b3233e
+Subproject commit c61f9fcbb0a5b8b2a2df67fd9de11b701d1ba872
diff --git a/folly b/folly
index 2a2aadce..73e5f8cf 160000
--- a/folly
+++ b/folly
@@ -1 +1 @@
-Subproject commit 2a2aadce595ee2861af623bd6927d55e90761266
+Subproject commit 73e5f8cf57009b71486c53434ad2711e5b0a1728