diff --git a/build/fbcode_builder/manifests/bz2 b/build/fbcode_builder/manifests/bz2
index af2f357d..cfbea9c8 100644
--- a/build/fbcode_builder/manifests/bz2
+++ b/build/fbcode_builder/manifests/bz2
@@ -3,12 +3,14 @@ name = bz2
 
 [debs]
 libbz2-dev
+bzip2
 
 [homebrew]
 bzip2
 
 [rpms]
 bzip2-devel
+bzip2
 
 [download]
 url = https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
diff --git a/build/fbcode_builder/manifests/python-setuptools b/build/fbcode_builder/manifests/python-setuptools
index 7ca2e1e4..6e71b3b0 100644
--- a/build/fbcode_builder/manifests/python-setuptools
+++ b/build/fbcode_builder/manifests/python-setuptools
@@ -7,3 +7,12 @@ sha256 = 02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56
 
 [build]
 builder = python-wheel
+
+[rpms]
+python3-setuptools
+
+[homebrew]
+python-setuptools
+
+[debs]
+python3-setuptools
diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling
index bbbfe1e4..c067360e 100644
--- a/build/fbcode_builder/manifests/sapling
+++ b/build/fbcode_builder/manifests/sapling
@@ -65,6 +65,7 @@ hexdump
 
 [dependencies.not(os=windows)]
 python
+python-setuptools
 
 # We use the system openssl on linux
 [dependencies.not(os=linux)]