diff --git a/bindep.txt b/bindep.txt
index dfe61db..f2924a2 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -28,15 +28,19 @@ git-core          [platform:dpkg]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
 python2.7         [platform:dpkg]
+python-apt        [platform:dpkg]
 python-dev        [platform:dpkg]
 
 # Base requirements for RPM distros
 gcc               [platform:rpm]
 gcc-c++           [platform:rpm]
 git               [platform:rpm]
-libffi-devel      [platform:rpm]
-openssl-devel     [platform:rpm]
+libffi-devel      [platform:rpm !platform:opensuseproject-42]
+libffi-devel-gcc5 [platform:opensuseproject-42]
+openssl-devel     [platform:redhat]
+libopenssl-devel  [platform:suse]
 python-devel      [platform:rpm]
+python2-dnf       [platform:fedora]
 
 # For SELinux
 libselinux-python [platform:redhat]
@@ -44,12 +48,15 @@ libsemanage-python [platform:redhat]
 
 # For SSL SNI support
 python-pyasn1               [platform:dpkg platform:suse]
-python-openssl              [platform:dpkg platform:suse]
-python-ndg-httpsclient      [platform:ubuntu]
+python-openssl              [platform:dpkg]
+python-ndg-httpsclient      [platform:ubuntu !platform:ubuntu-14]
 python2-pyasn1              [platform:redhat]
-python2-pyOpenSSL           [platform:redhat]
-python-pyOpenSSL            [platform:suse]
-python-ndg_httpsclient      [platform:redhat]
+python2-pyOpenSSL           [platform:redhat !platform:fedora]
+pyOpenSSL                   [platform:fedora]
+python-pyOpenSSL            [platform:opensuseproject-42]
+python2-pyOpenSSL           [platform:suse !platform:opensuseproject-42]
+python-ndg_httpsclient      [platform:redhat !platform:fedora]
+python2-ndg_httpsclient     [platform:fedora]
 python-ndg-httpsclient      [platform:suse]
 
 # Required for compressing collected log files in CI