diff --git a/devstack/lib/fip_port_forwarding b/devstack/lib/fip_port_forwarding
new file mode 100644
index 00000000000..30474bf51e3
--- /dev/null
+++ b/devstack/lib/fip_port_forwarding
@@ -0,0 +1,4 @@
+function configure_port_forwarding {
+    neutron_service_plugin_class_add "port_forwarding"
+    plugin_agent_add_l3_agent_extension "port_forwarding"
+}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d26a929bf26..b7d114fca45 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -11,6 +11,7 @@ source $LIBDIR/ovs
 source $LIBDIR/segments
 source $LIBDIR/trunk
 source $LIBDIR/log
+source $LIBDIR/fip_port_forwarding
 
 Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
 
@@ -68,6 +69,9 @@ if [[ "$1" == "stack" ]]; then
                 if is_service_enabled q-qos neutron-qos; then
                     configure_l3_agent_extension_fip_qos
                 fi
+                if is_service_enabled q-port-forwarding neutron-port-forwarding; then
+                    configure_port_forwarding
+                fi
                 configure_l3_agent
             fi
             if [ $NEUTRON_CORE_PLUGIN = ml2 ]; then