diff --git a/bindep.txt b/bindep.txt
index aea57bd..a016b20 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,5 @@
 apache2                     [platform:dpkg apache]
-bridge-utils                [(neutron linuxbridge)]
+bridge-utils                [(neutron linuxbridge) (nova linuxbridge)]
 build-essential             [platform:dpkg requirements]
 bzip2                       [platform:rpm requirements]
 ceph-common                 [(ceph cinder) (ceph glance) (ceph nova)]
@@ -16,7 +16,7 @@ haproxy                     [neutron]
 httpd                       [platform:rpm apache]
 iproute2                    [platform:dpkg neutron nova]
 ipset                       [neutron]
-iptables                    [neutron]
+iptables                    [neutron (nova linuxbridge)]
 iputils-arping              [platform:dpkg neutron]
 keepalived                  [neutron]
 libapache2-mod-wsgi         [platform:dpkg apache]
@@ -26,7 +26,7 @@ libffi-devel                [platform:rpm requirements]
 libffi-dev                  [platform:dpkg requirements]
 libgcrypt                   [platform:rpm requirements]
 libkrb5-dev                 [platform:dpkg requirements]
-libldap-2.4-2               [platform:rpm (ldap keystone !python3)]
+libldap-2.4-2               [platform:dpkg (keystone ldap !python3)]
 libldap2-dev                [platform:dpkg requirements]
 libmariadbclient-dev        [platform:debian requirements]
 libmysqlclient-dev          [platform:ubuntu requirements]
@@ -57,7 +57,7 @@ mod_wsgi                    [platform:rpm apache]
 nginx                       [nginx]
 nss-devel                   [platform:rpm requirements]
 nss-util                    [platform:rpm requirements]
-openldap                    [platform:rpm (ldap keystone !python3)]
+openldap                    [platform:rpm (keystone ldap !python3)]
 openldap-devel              [platform:rpm requirements]
 openssl-devel               [platform:rpm requirements]
 openvswitch                 [platform:rpm (neutron openvswitch) (nova openvswitch)]
@@ -70,10 +70,10 @@ python-devel                [platform:rpm (requirements !python3)]
 python3-devel               [platform:rpm (requirements python3)]
 python-dev                  [platform:dpkg (requirements !python3)]
 python3-dev                 [platform:dpkg (requirements python3)]
-python-rbd                  [(ceph glance !python3)]
-python3-rbd                 [(ceph glance python3)]
-qemu-img                    [platform:rpm (qemu nova)]
-qemu-utils                  [platform:dpkg (qemu nova)]
+python-rbd                  [(glance ceph !python3)]
+python3-rbd                 [(glance ceph python3)]
+qemu-img                    [platform:rpm (nova qemu)]
+qemu-utils                  [platform:dpkg (nova qemu)]
 systemd-devel               [platform:rpm requirements]
 targetcli                   [platform:rpm (cinder lvm)]
 tgt                         [platform:dpkg (cinder lvm)]