diff --git a/doc/source/install-guide/configure-network-services.rst b/doc/source/install-guide/configure-network-services.rst
index 5f4452313e..d8ebdaa775 100644
--- a/doc/source/install-guide/configure-network-services.rst
+++ b/doc/source/install-guide/configure-network-services.rst
@@ -142,7 +142,7 @@ to manually delete load balancers, pools, and members before switching LBaaS
 versions. Those objects will need to be re-created afterwards.
 
 Virtual Private Network Service (Optional)
----------------------------------------------------
+------------------------------------------
 
 The following procedure describes how to modify the
 ``/etc/openstack_deploy/user_variables.yml`` file to enable VPNaaS.
diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml
index a4fba209e5..22d78d0197 100644
--- a/playbooks/inventory/group_vars/hosts.yml
+++ b/playbooks/inventory/group_vars/hosts.yml
@@ -221,6 +221,7 @@ horizon_enable_cinder_backup: "{% if cinder_service_backup_program_enabled is de
 #TODO(odyssey4me): Remove the classpath from this conditional in the Newton cycle.
 horizon_enable_neutron_lbaas: "{% if neutron_plugin_base is defined and ('lbaas' in neutron_plugin_base or 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin' in neutron_plugin_base) %}True{% else %}False{% endif %}"
 horizon_enable_neutron_fwaas: "{% if neutron_plugin_base is defined and 'firewall' in neutron_plugin_base %}True{% else %}False{% endif %}"
+horizon_enable_neutron_vpnaas: "{% if neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base %}True{% else %}False{% endif %}"
 horizon_rabbitmq_userid: horizon
 horizon_rabbitmq_vhost: /horizon
 
diff --git a/releasenotes/notes/neutron-vpnaas-5c7c6508f2cc05c5.yaml b/releasenotes/notes/neutron-vpnaas-5c7c6508f2cc05c5.yaml
new file mode 100644
index 0000000000..2fe9709ed0
--- /dev/null
+++ b/releasenotes/notes/neutron-vpnaas-5c7c6508f2cc05c5.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - Neutron VPN as a Service (VPNaaS) can now optionally be deployed and
+    configured. Please see the `OpenStack Networking Guide
+    <http://docs.openstack.org/mitaka/networking-guide/>`_ for details
+    about the what the service is and what it provides. See the
+    `VPNaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-network-services.html#virtual-private-network-service-optional>`_
+    for implementation details.