diff --git a/bindep.txt b/bindep.txt
index bc454d596c..b798a8cd05 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -5,11 +5,15 @@ app-crypt/mit-krb5 [platform:gentoo]
 krb5-devel [platform:redhat]
 libffi-dev [platform:dpkg]
 libffi-devel [platform:redhat]
+libjpeg-dev [platform:dpkg]
+libjpeg-devel [platform:rpm]
 libkrb5-dev [platform:dpkg]
 libldap2-dev [platform:dpkg]
-libmysqlclient-dev [platform:dpkg]
+libmysqlclient-dev [platform:ubuntu-xenial]
+libmariadb-dev [platform:dpkg !platform:ubuntu-xenial]
 libnss3-dev [platform:dpkg]
 libpq-dev [platform:dpkg]
+librdkafka-dev [platform:dpkg] # we need 1.4.0+ which is only in Debian:bullseye so far
 libsasl2-dev [platform:dpkg]
 libsqlite3-dev [platform:dpkg]
 libuuid-devel [platform:rpm]
@@ -19,8 +23,7 @@ libxml2-dev [platform:dpkg]
 libxml2-devel [platform:rpm]
 libxslt-devel [platform:rpm]
 libxslt1-dev [platform:dpkg]
-libzmq-dev [platform:dpkg !platform:ubuntu-bionic !platform:ubuntu-focal]
-libzmq3-dev [platform:dpkg !platform:ubuntu-xenial]
+libzmq3-dev [platform:dpkg]
 mariadb-devel [platform:redhat]
 mozilla-nss-devel [platform:suse]
 nss-devel [platform:redhat]
@@ -49,7 +52,7 @@ python-yaml [python]
 
 # NOTE(dirk) needed for PyECLib
 liberasurecode-dev [platform:dpkg]
-liberasurecode-devel [platform:rpm]
+liberasurecode-devel [platform:rpm] # RDO repo
 dev-libs/liberasurecode [platform:gentoo]
 libsystemd-dev [platform:dpkg !platform:ubuntu-trusty]
 libsystemd-journal-dev [platform:ubuntu-trusty]
@@ -63,3 +66,14 @@ unzip [test]
 # NOTE(pabelanger): You must first enable epel to install parallel RPM on
 # centos-7.
 parallel [test]
+
+# NOTE(hrw): Needed for numpy/scipy
+gfortran [platform:dpkg]
+liblapack-dev [platform:dpkg]
+libopenblas-dev [platform:dpkg]
+gcc-c++ [platform:rpm]
+gcc-gfortran [platform:rpm]
+lapack-devel [platform:rpm]
+openblas-devel [platform:rpm !platform:centos-7]
+blas-devel [platform:centos-7]
+