diff --git a/configure.ac b/configure.ac
index 116e9c612..bc29053bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,11 @@ AS_IF([test "x$enable_c_analyzers" = "xyes"], [
 
   AC_CHECK_TOOL([SHASUM], [shasum], [no])
   AC_ASSERT_PROG([shasum], [$SHASUM])
+  # cmake is required to build llvm+clang
+  AS_IF([test "x$is_release_tree" = "xno"], [
+    AC_CHECK_TOOL([CMAKE], [cmake], [no])
+    AC_ASSERT_PROG([cmake], [$CMAKE])
+  ])
 ])
 # end if($enable_c_analyzers)
 
diff --git a/facebook-clang-plugins b/facebook-clang-plugins
index d80000de3..c9593f66d 160000
--- a/facebook-clang-plugins
+++ b/facebook-clang-plugins
@@ -1 +1 @@
-Subproject commit d80000de3620746585b69b05443a89cb4d7a5343
+Subproject commit c9593f66d93dc556a02c65894f2aae13b316802a