diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 41d198ddb9..6ac92403e4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -129,3 +129,13 @@ elif [[ $Q_PLUGIN == 'vmware_nsx_p' ]]; then
         fi
     fi
 fi
+
+if [[ "$1" == "stack" && "$2" == "post-config" ]]; then
+    if is_service_enabled q-fwaas-v2; then
+        # make sure ml2 config exists for FWaaS-v2
+        if [ ! -f "/etc/neutron/plugins/ml2/ml2_conf.ini" ]; then
+            mkdir /etc/neutron/plugins/ml2
+            cp $DEST/neutron/etc/neutron/plugins/ml2/ml2_conf.ini.sample /etc/neutron/plugins/ml2/ml2_conf.ini
+        fi
+    fi
+fi