diff --git a/etc/neutron.conf b/etc/neutron.conf
index dc889486059..14eb8b2374d 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -149,6 +149,7 @@
 # max_subnet_host_routes = 20
 
 # Maximum number of fixed ips per port
+# Deprecated: will be removed in N
 # max_fixed_ips_per_port = 5
 
 # Maximum number of routes per router
diff --git a/neutron/common/config.py b/neutron/common/config.py
index b6ba1a716e7..572737e6333 100644
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -71,6 +71,7 @@ core_opts = [
     cfg.IntOpt('max_subnet_host_routes', default=20,
                help=_("Maximum number of host routes per subnet")),
     cfg.IntOpt('max_fixed_ips_per_port', default=5,
+               deprecated_for_removal=True,
                help=_("Maximum number of fixed ips per port")),
     cfg.StrOpt('default_ipv4_subnet_pool', default=None,
                help=_("Default IPv4 subnet-pool to be used for automatic "