diff --git a/doc/source/devref/openvswitch_agent.rst b/doc/source/devref/openvswitch_agent.rst
index c6f165064a7..ae8660af3c5 100644
--- a/doc/source/devref/openvswitch_agent.rst
+++ b/doc/source/devref/openvswitch_agent.rst
@@ -6,7 +6,10 @@ This Agent uses the `OpenVSwitch`_ virtual switch to create L2
 connectivity for instances, along with bridges created in conjunction
 with OpenStack Nova for filtering.
 
-ovs-neutron-agent can be configured to use two different networking technologies to create tenant isolation, either GRE tunnels or VLAN tags.
+ovs-neutron-agent can be configured to use different networking technologies
+to create tenant isolation.
+These technologies are implemented as ML2 type drivers which are used in
+conjunction with the OpenVSwitch mechanism driver.
 
 VLAN Tags
 ---------
@@ -23,6 +26,16 @@ GRE Tunneling is documented in depth in the `Networking in too much
 detail <http://openstack.redhat.com/Networking_in_too_much_detail>`_
 by RedHat.
 
+
+VXLAN Tunnels
+-------------
+
+VXLAN is an overlay technology which encapsulates MAC frames
+at layer 2 into a UDP header.
+More information can be found in `The VXLAN wiki page.
+ <http://en.wikipedia.org/wiki/Virtual_Extensible_LAN>`_
+
+
 Further Reading
 ---------------