diff --git a/doc/source/admin/config-ml2.rst b/doc/source/admin/config-ml2.rst
index 6a121f5dfb4..0522d60dbd1 100644
--- a/doc/source/admin/config-ml2.rst
+++ b/doc/source/admin/config-ml2.rst
@@ -243,7 +243,7 @@ For more details, see the
 
   The administrator can configure some optional configuration options. For more
   details, see the related section in the
-  `Configuration Reference <https://docs.openstack.org/ocata/config-reference/networking/networking_options_reference.html#modular-layer-2-ml2-l2-population-mechanism-configuration-options>`__.
+  `Configuration Reference <../configuration/ml2-conf.html#l2pop>`__.
 
 * Specialized
 
diff --git a/neutron/opts.py b/neutron/opts.py
index 5415899d9ba..328574a5053 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -36,6 +36,7 @@ import neutron.conf.extensions.allowedaddresspairs
 import neutron.conf.plugins.ml2.config
 import neutron.conf.plugins.ml2.drivers.agent
 import neutron.conf.plugins.ml2.drivers.driver_type
+import neutron.conf.plugins.ml2.drivers.l2pop
 import neutron.conf.plugins.ml2.drivers.linuxbridge
 import neutron.conf.plugins.ml2.drivers.macvtap
 import neutron.conf.plugins.ml2.drivers.mech_sriov.agent_common
@@ -247,7 +248,9 @@ def list_ml2_conf_opts():
         ('ml2_type_geneve',
          neutron.conf.plugins.ml2.drivers.driver_type.geneve_opts),
         ('securitygroup',
-         neutron.conf.agent.securitygroups_rpc.security_group_opts)
+         neutron.conf.agent.securitygroups_rpc.security_group_opts),
+        ('l2pop',
+         neutron.conf.plugins.ml2.drivers.l2pop.l2_population_options)
     ]