diff --git a/autogenerate_config_docs/autohelp-wrapper b/autogenerate_config_docs/autohelp-wrapper
index 659103f7..c58aedcf 100755
--- a/autogenerate_config_docs/autohelp-wrapper
+++ b/autogenerate_config_docs/autohelp-wrapper
@@ -52,7 +52,6 @@ setup_venv() {
     if [ ! -e $VENVDIR/$project/bin/activate ]; then
         mkdir -p $VENVDIR/$project
         virtualenv $VENVDIR/$project
-        pip install --upgrade pip
     fi
     activate_venv $project
 }
@@ -61,6 +60,7 @@ activate_venv() {
     project=$1
 
     . $VENVDIR/$project/bin/activate
+    pip install --upgrade pip
 }
 
 get_project() {
@@ -94,10 +94,7 @@ get_project() {
 
 setup_tools() {
     (cd $SOURCESDIR/oslo-incubator && python setup.py install)
-    pip install "GitPython>=0.3.2.RC1"
-
-    # autohelp.py requires this
-    pip install oslo.i18n lxml
+    pip install -rrequirements.txt
 }
 
 while getopts :b:g:e:cf opt; do
diff --git a/autogenerate_config_docs/diff_branches.py b/autogenerate_config_docs/diff_branches.py
index 4654f4ab..d8e63489 100755
--- a/autogenerate_config_docs/diff_branches.py
+++ b/autogenerate_config_docs/diff_branches.py
@@ -26,13 +26,14 @@ import git
 from lxml import etree
 
 
-PROJECTS = ['ceilometer', 'cinder', 'glance', 'heat', 'keystone', 'neutron',
-            'nova', 'sahara', 'swift', 'trove']
+PROJECTS = ['ceilometer', 'cinder', 'glance', 'heat', 'ironic', 'keystone',
+            'neutron', 'nova', 'sahara', 'swift', 'trove']
 MASTER_RELEASE = 'Liberty'
 CODENAME_TITLE = {'ceilometer': 'Telemetry',
                   'cinder': 'OpenStack Block Storage',
                   'glance': 'OpenStack Image service',
                   'heat': 'Orchestration',
+                  'ironic': 'Bare metal service',
                   'keystone': 'OpenStack Identity',
                   'neutron': 'OpenStack Networking',
                   'nova': 'OpenStack Compute',
@@ -55,27 +56,44 @@ def setup_venv(branch, novenvupdate):
         sys.exit(1)
 
 
+def _get_packages(project, branch):
+    release = branch if '/' not in branch else branch.split('/')[1]
+    packages = [project]
+    try:
+        with open('extra_repos/%s-%s' % (project, release)) as f:
+            packages.extend([p.strip() for p in f])
+    except IOError:
+        pass
+
+    return packages
+
+
 def get_options(project, branch, args):
     """Get the list of known options for a project."""
     print("Working on %(project)s (%(branch)s)" % {'project': project,
                                                    'branch': branch})
-    # Checkout the required branch
-    repo_path = os.path.join(args.sources, project)
-    repo = git.Repo(repo_path)
-    repo.heads[branch].checkout()
-
     # And run autohelp script to get a serialized dict of the discovered
     # options
     dirname = os.path.abspath(os.path.join('venv',
                                            branch.replace('/', '_'),
                                            project))
+
     if project == 'swift':
         cmd = ("python extract_swift_flags.py dump "
                "-s %(sources)s/swift -m %(sources)s/openstack-manuals" %
                {'sources': args.sources})
+        repo_path = args.sources
     else:
-        cmd = ("python autohelp.py dump %(project)s -i %(path)s" %
-               {'project': project, 'path': repo_path})
+        packages = _get_packages(project, branch)
+        autohelp_args = ""
+        for package in packages:
+            repo_path = os.path.join(args.sources, project)
+            repo = git.Repo(repo_path)
+            repo.heads[branch].checkout()
+            autohelp_args += (" -i %s/%s" %
+                              (repo_path, package.replace('-', '_')))
+        cmd = ("python autohelp.py dump %(project)s %(args)s" %
+               {'project': project, 'args': autohelp_args})
     path = os.environ.get("PATH")
     bin_path = os.path.abspath(os.path.join(dirname, "bin"))
     path = "%s:%s" % (bin_path, path)
diff --git a/autogenerate_config_docs/requirements/neutron-kilo.txt b/autogenerate_config_docs/requirements/neutron-kilo.txt
index ac0385a8..8cbe0794 100644
--- a/autogenerate_config_docs/requirements/neutron-kilo.txt
+++ b/autogenerate_config_docs/requirements/neutron-kilo.txt
@@ -1,34 +1,43 @@
 ryu
+
+# lbaas
+kemptech-openstack-lbaas
+a10-neutron-lbaas
+neutron_radware_lbaas
+neutron_radware_lbaas_v2
+
 # for vmware
 -e git://git.openstack.org/openstack/nova.git@stable/kilo#egg=nova
 
 # for a bunch of plugins
 -e git://git.openstack.org/openstack/neutron.git@stable/kilo#egg=neutron
+-e git://git.openstack.org/openstack/neutron-fwaas.git@stable/kilo#egg=neutron-fwaas
 -e git://git.openstack.org/openstack/neutron-lbaas.git@stable/kilo#egg=neutron-lbaas
+-e git://git.openstack.org/openstack/neutron-vpnaas.git@stable/kilo#egg=neutron-vpnaas
 
 # for midonet
 -e git://github.com/midonet/python-midonetclient.git#egg=midonetclient
 
--e git+https://git.openstack.org/stackforge/networking-arista.git@stable/kilo#egg=networking-arista
--e git+https://git.openstack.org/stackforge/networking-bagpipe-l2.git@master#egg=networking-bagpipe-l2
--e git+https://git.openstack.org/stackforge/networking-bgpvpn.git@master#egg=networking-bgpvpn
--e git+https://git.openstack.org/stackforge/networking-bigswitch.git@master#egg=networking-bigswitch
--e git+https://git.openstack.org/stackforge/networking-brocade.git@master#egg=networking-brocade
--e git+https://git.openstack.org/stackforge/networking-cisco.git@stable/kilo#egg=networking-cisco
--e git+https://git.openstack.org/stackforge/networking-edge-vpn.git@master#egg=networking-edge-vpn
--e git+https://git.openstack.org/stackforge/networking-hyperv.git@master#egg=networking-hyperv
--e git+https://git.openstack.org/stackforge/networking-ibm.git@master#egg=networking-ibm
--e git+https://git.openstack.org/stackforge/networking-l2gw.git@master#egg=networking-l2gw
+-e git+https://git.openstack.org/openstack/networking-arista.git@stable/kilo#egg=networking-arista
+-e git+https://git.openstack.org/stackforge/networking-bagpipe-l2.git@stable/kilo#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-cisco.git@stable/kilo#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@stable/kilo#egg=networking-hyperv
+-e git+https://git.openstack.org/stackforge/networking-ibm.git#egg=networking-ibm
+-e git+https://git.openstack.org/openstack/networking-l2gw.git@stable/kilo#egg=networking-l2gw
 # pip dependency installation failure
--e git+https://git.openstack.org/stackforge/networking-midonet.git@master#egg=networking-midonet
--e git+https://git.openstack.org/stackforge/networking-mlnx.git@master#egg=networking-mlnx
+-e git+https://git.openstack.org/openstack/networking-midonet.git@stable/kilo#egg=networking-midonet
+-e git+https://git.openstack.org/stackforge/networking-mlnx.git@stable/kilo#egg=networking-mlnx
 -e git+https://git.openstack.org/stackforge/networking-nec.git@stable/kilo#egg=networking-nec
--e git+https://git.openstack.org/stackforge/networking-odl.git@master#egg=networking-odl
--e git+https://git.openstack.org/stackforge/networking-ofagent.git@master#egg=networking-ofagent
--e git+https://git.openstack.org/stackforge/networking-ovn.git@master#egg=networking-ovn
+-e git+https://git.openstack.org/openstack/networking-odl.git@stable/kilo#egg=networking-odl
+-e git+https://git.openstack.org/openstack/networking-ofagent.git@stable/kilo#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@stable/kilo#egg=networking-ovs-dpdk
--e git+https://git.openstack.org/stackforge/networking-plumgrid.git@master#egg=networking-plumgrid
--e git+https://git.openstack.org/stackforge/networking-portforwarding.git@master#egg=networking-portforwarding
--e git+https://git.openstack.org/stackforge/networking-vsphere.git@master#egg=networking-vsphere
--e git+https://git.openstack.org/stackforge/neutron-powervm.git@master#egg=neutron-powervm
--e git+https://git.openstack.org/stackforge/vmware-nsx.git#egg=vmware-nsx
+-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@stable/kilo#egg=networking-vsphere
+-e git+https://git.openstack.org/stackforge/neutron-powervm.git#egg=neutron-powervm
+-e git+https://git.openstack.org/openstack/vmware-nsx.git@stable/kilo#egg=vmware-nsx