diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py
index d9fcbcf1d..cde97c9fd 100644
--- a/build/fbcode_builder/fbcode_builder.py
+++ b/build/fbcode_builder/fbcode_builder.py
@@ -325,8 +325,8 @@ class FBCodeBuilder(object):
         )
         return [
             self.run(ShellQuoted(
-                'CXXFLAGS="$CXXFLAGS -isystem "{p}"/include" '
-                'CFLAGS="$CFLAGS -isystem "{p}"/include" '
+                'CXXFLAGS="$CXXFLAGS -fPIC -isystem "{p}"/include" '
+                'CFLAGS="$CFLAGS -fPIC -isystem "{p}"/include" '
                 'cmake {args} ..'
             ).format(
                 p=self.option('prefix'),
diff --git a/build/fbcode_builder/specs/fbthrift.py b/build/fbcode_builder/specs/fbthrift.py
index 7885e6de0..93db874a5 100644
--- a/build/fbcode_builder/specs/fbthrift.py
+++ b/build/fbcode_builder/specs/fbthrift.py
@@ -23,6 +23,6 @@ def fbcode_builder_spec(builder):
             # This isn't a separete spec, since only fbthrift uses mstch.
             builder.github_project_workdir('no1msd/mstch', 'build'),
             builder.cmake_install('no1msd/mstch'),
-            builder.fb_github_autoconf_install('fbthrift/thrift'),
+            builder.fb_github_cmake_install('fbthrift/thrift'),
         ],
     }