diff --git a/Makefile b/Makefile
index 9ad99ed3a..3b5ff28eb 100644
--- a/Makefile
+++ b/Makefile
@@ -254,7 +254,7 @@ clang_setup:
 	export CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"; \
 	export CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)"; \
 	$(FCP_DIR)/clang/setup.sh --only-check-install || \
-	$(FCP_DIR)/clang/setup.sh $(INFER_FCP_SETUP_OPTS)
+	$(FCP_DIR)/clang/setup.sh
 
 .PHONY: clang_plugin
 clang_plugin: clang_setup
diff --git a/facebook-clang-plugins b/facebook-clang-plugins
index ad20e6754..74635a68e 160000
--- a/facebook-clang-plugins
+++ b/facebook-clang-plugins
@@ -1 +1 @@
-Subproject commit ad20e6754fe46be0e2793a8c986dc4c7fc66c047
+Subproject commit 74635a68ec1fee857cf1d3c3bfa7503f3a41491e
diff --git a/opam b/opam
index 9762f03cf..4ec8f6837 100644
--- a/opam
+++ b/opam
@@ -32,6 +32,7 @@ depends: [
   "cmdliner" {>="1.0.0"}
   "core"
   "conf-autoconf" {build}
+  "conf-zlib" {build}
   "ctypes" {>="0.9.2"}
   "extlib-compat"
   "javalib" {>="2.3.4"}
diff --git a/opam.lock b/opam.lock
index 536c58a73..228e3ae3e 100644
--- a/opam.lock
+++ b/opam.lock
@@ -13,6 +13,7 @@ conf-autoconf = 0.1
 conf-m4 = 1
 conf-pkg-config = 1.0
 conf-which = 1
+conf-zlib = 1
 configurator = v0.11.0
 core = v0.11.0
 core_kernel = v0.11.0