diff --git a/AUTHORS b/AUTHORS
index ec71326f6e..dc12105f87 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 Adam Gandelman <adamg@canonical.com>
 Andy Smith <github@anarkystic.com>
 Anthony Young <sleepsonthefloor@gmail.com>
+Armando Migliaccio <armando.migliaccio@eu.citrix.com>
 Brad Hall <brad@nicira.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
 Dean Troyer <dtroyer@gmail.com>
diff --git a/stack.sh b/stack.sh
index f0830a1733..17972c9d07 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1235,6 +1235,8 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
     add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER"
 else
     add_nova_flag "--connection_type=libvirt"
+    LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
+    add_nova_flag "--firewall_driver=$LIBVIRT_FIREWALL_DRIVER"
     add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"
     if [ -n "$FLAT_INTERFACE" ]; then
         add_nova_flag "--flat_interface=$FLAT_INTERFACE"