diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper
index 633c7311..0c9318f5 100755
--- a/autogenerate_config_docs/autohelp-wrapper
+++ b/autogenerate_config_docs/autohelp-wrapper
@@ -21,7 +21,6 @@ AUTOHELP="python $HERE/autohelp.py"
 EXTRACT_SWIFT="python $HERE/extract_swift_flags.py"
 GITBASE=git://git.openstack.org/openstack
 GITPROJ=git://git.openstack.org/openstack
-GITSTACKPROJ=git://git.openstack.org/stackforge
 PROJECTS="ceilometer cinder glance heat ironic keystone neutron nova sahara swift trove"
 MANUALS_PROJECTS="openstack-manuals oslo-incubator"
 BRANCH=master
@@ -69,7 +68,6 @@ activate_venv() {
 get_project() {
     project=$1
     git_url=$GITPROJ
-    git_url_stackforge=$GITSTACKPROJ
 
     if [ ! -e $SOURCESDIR/$project ]; then
         if [[ $MANUALS_PROJECTS =~ (^| )$project($| ) ]]; then
@@ -83,12 +81,6 @@ get_project() {
             done < extra_repos/$project-$RELEASE
         fi
 
-        if [ -e extra_repos/$project-$RELEASE-stackforge ]; then
-            while read extra; do
-                git clone $git_url_stackforge/$extra $SOURCESDIR/$extra
-            done < extra_repos/$project-$RELEASE-stackforge
-        fi
-
     else
         if [ $project != openstack-manuals ]; then
             (cd $SOURCESDIR/$project && git pull)
@@ -216,13 +208,6 @@ for project in $PROJECTS; do
             if [ $package = "networking_midonet" ]; then
                 package="midonet"
             fi
-            extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package"
-        done < extra_repos/$project-$RELEASE
-    fi
-
-    if [ -e extra_repos/$project-$RELEASE-stackforge ]; then
-        while read extra; do
-            package=$(echo $extra | tr - _)
             if [ $package = "networking_hyperv" ]; then
                 package="hyperv"
             fi
@@ -236,7 +221,7 @@ for project in $PROJECTS; do
                 package="neutron"
             fi
             extra_flags="$extra_flags -i $SOURCESDIR/$extra/$package"
-        done < extra_repos/$project-$RELEASE-stackforge
+        done < extra_repos/$project-$RELEASE
     fi
 
     cd $MANUALSREPO/tools/autogenerate-config-flagmappings
diff --git a/autogenerate_config_docs/autohelp.py b/autogenerate_config_docs/autohelp.py
index 7e1eb257..486f78d8 100755
--- a/autogenerate_config_docs/autohelp.py
+++ b/autogenerate_config_docs/autohelp.py
@@ -52,6 +52,15 @@ IGNORE = [
     'glance.contrib.plugins.image_artifact.setup',
     'manila.db.migrations.alembic.env',
     'neutron.plugins.ml2.drivers.cisco.nexus.type_nexus_vxlan',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.exceptions',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.mech_cisco_n1kv',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.n1kv_client',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.n1kv_db',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.n1kv_ext_driver',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.n1kv_models',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.n1kv_sync',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.network_profile_service',
+    'networking_cisco.plugins.ml2.drivers.cisco.n1kv.policy_profile_service',
     'trove.guestagent.datastore.experimental.postgresql.manager',
     'trove.guestagent.datastore.experimental.postgresql.service.database',
     'trove.guestagent.datastore.experimental.postgresql.service.root',
diff --git a/autogenerate_config_docs/extra_repos/neutron-master b/autogenerate_config_docs/extra_repos/neutron-master
index 07e0b1c2..cbc628cf 100644
--- a/autogenerate_config_docs/extra_repos/neutron-master
+++ b/autogenerate_config_docs/extra_repos/neutron-master
@@ -1,21 +1,31 @@
 neutron-fwaas
 neutron-lbaas
 neutron-vpnaas
-networking-arista
-networking-bgpvpn
-networking-cisco
-networking-l2gw
-networking-sfc
-networking-infoblox
-networking-fujitsu
-networking-onos
-networking-calico
+networking-6wind
 networking-ale-omniswitch
+networking-arista
+networking-bagpipe-l2
+networking-bgpvpn
+networking-brocade
+networking-calico
+networking-cisco
+networking-edge-vpn
+networking-fujitsu
+networking-hyperv
+networking-infoblox
+networking-l2gw
 networking-midonet
+networking-mlnx
+networking-nec
 networking-odl
 networking-ofagent
+networking-onos
 networking-ovn
+networking-ovs-dpdk
 networking-plumgrid
-networking-vsphere
 networking-powervm
+networking-sfc
+networking-vsphere
+networking-zvm
+octavia
 vmware-nsx
diff --git a/autogenerate_config_docs/extra_repos/neutron-master-stackforge b/autogenerate_config_docs/extra_repos/neutron-master-stackforge
deleted file mode 100644
index 48395eb6..00000000
--- a/autogenerate_config_docs/extra_repos/neutron-master-stackforge
+++ /dev/null
@@ -1,11 +0,0 @@
-networking-bagpipe-l2
-networking-bigswitch
-networking-brocade
-networking-edge-vpn
-networking-hyperv
-networking-ibm
-networking-mlnx
-networking-nec
-networking-ovs-dpdk
-networking-zvm
-networking-6wind
diff --git a/autogenerate_config_docs/requirements/neutron-master.txt b/autogenerate_config_docs/requirements/neutron-master.txt
index c803a3d7..cb98f11b 100644
--- a/autogenerate_config_docs/requirements/neutron-master.txt
+++ b/autogenerate_config_docs/requirements/neutron-master.txt
@@ -19,14 +19,13 @@ neutron_radware_lbaas_v2
 -e git+https://github.com/midonet/python-midonetclient.git@master#egg=midonetclient
 
 -e git+https://git.openstack.org/openstack/networking-arista.git#egg=networking-arista
--e git+https://git.openstack.org/stackforge/networking-bagpipe-l2.git#egg=networking-bagpipe-l2
--e git+https://git.openstack.org/openstack/networking-bgpvpn.git#egg=networking-bgpvpn
--e git+https://git.openstack.org/stackforge/networking-bigswitch.git#egg=networking-bigswitch
--e git+https://git.openstack.org/stackforge/networking-brocade.git#egg=networking-brocade
+-e git+https://git.openstack.org/openstack/networking-bagpipe-l2.git#egg=networking-bagpipe-l2
+#-e git+https://git.openstack.org/openstack/networking-bgpvpn.git#egg=networking-bgpvpn
+#-e git+https://git.openstack.org/stackforge/networking-bigswitch.git#egg=networking-bigswitch
+-e git+https://git.openstack.org/openstack/networking-brocade.git#egg=networking-brocade
 -e git+https://git.openstack.org/openstack/networking-cisco.git#egg=networking-cisco
--e git+https://git.openstack.org/stackforge/networking-edge-vpn.git#egg=networking-edge-vpn
--e git+https://git.openstack.org/stackforge/networking-hyperv.git#egg=networking-hyperv
--e git+https://git.openstack.org/stackforge/networking-ibm.git#egg=networking-ibm
+-e git+https://git.openstack.org/openstack/networking-edge-vpn.git#egg=networking-edge-vpn
+-e git+https://git.openstack.org/openstack/networking-hyperv.git#egg=networking-hyperv
 -e git+https://git.openstack.org/openstack/networking-l2gw.git#egg=networking-l2gw
 -e git+https://git.openstack.org/openstack/networking-sfc.git#egg=networking-sfc
 -e git+https://git.openstack.org/openstack/networking-infoblox.git#egg=networking-infoblox
@@ -36,16 +35,16 @@ neutron_radware_lbaas_v2
 -e git+https://git.openstack.org/openstack/networking-ale-omniswitch.git#egg=networking-ale-omniswitch
 #-e git+https://git.openstack.org/openstack/networking-lenovo.git#egg=networking-lenovo
 -e git+https://git.openstack.org/openstack/networking-midonet.git#egg=networking-midonet
--e git+https://git.openstack.org/stackforge/networking-mlnx.git#egg=networking-mlnx
--e git+https://git.openstack.org/stackforge/networking-nec.git#egg=networking-nec
+-e git+https://git.openstack.org/openstack/networking-mlnx.git#egg=networking-mlnx
+-e git+https://git.openstack.org/openstack/networking-nec.git#egg=networking-nec
 -e git+https://git.openstack.org/openstack/networking-odl.git#egg=networking-odl
 -e git+https://git.openstack.org/openstack/networking-ofagent.git#egg=networking-ofagent
 -e git+https://git.openstack.org/openstack/networking-ovn.git#egg=networking-ovn
--e git+https://git.openstack.org/stackforge/networking-ovs-dpdk.git#egg=networking-ovs-dpdk
+-e git+https://git.openstack.org/openstack/networking-ovs-dpdk.git#egg=networking-ovs-dpdk
 -e git+https://git.openstack.org/openstack/networking-plumgrid.git#egg=networking-plumgrid
--e git+https://git.openstack.org/stackforge/networking-portforwarding.git#egg=networking-portforwarding
 -e git+https://git.openstack.org/openstack/networking-vsphere.git#egg=networking-vsphere
 -e git+https://git.openstack.org/openstack/networking-powervm.git#egg=networking-powervm
 -e git+https://git.openstack.org/openstack/vmware-nsx.git#egg=vmware-nsx
--e git+https://git.openstack.org/stackforge/networking-zvm.git#egg=networking-zvm
--e git+https://git.openstack.org/stackforge/networking-6wind.git#egg=networking-6wind
+-e git+https://git.openstack.org/openstack/networking-zvm.git#egg=networking-zvm
+-e git+https://git.openstack.org/openstack/networking-6wind.git#egg=networking-6wind
+-e git+https://git.openstack.org/openstack/octavia.git#egg=octavia