diff --git a/MAINTAINERS b/MAINTAINERS
index 2dad16d..8ae5333 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -213,6 +213,8 @@
 
 VNET LISP
 I:	lisp
+Y:	src/vnet/lisp-cp/FEATURE.yaml
+Y:	src/vnet/lisp-gpe/FEATURE.yaml
 M:	Florin Coras <fcoras@cisco.com>
 F:	src/vnet/lisp-cp/
 F:	src/vnet/lisp-gpe/
diff --git a/src/vnet/lisp-cp/FEATURE.yaml b/src/vnet/lisp-cp/FEATURE.yaml
new file mode 100644
index 0000000..957186d
--- /dev/null
+++ b/src/vnet/lisp-cp/FEATURE.yaml
@@ -0,0 +1,14 @@
+---
+name: Locator/ID Separation Protocol (LISP) Control Plane
+maintainer: Florin Coras <fcoras@cisco.com>
+features:
+  - ITR, ETR and RTR mode of operation
+  - Multitenancy
+  - Multihoming
+  - Source/dest map-cache lookups
+  - RLOC-probing
+  - Support for Ethernet, IPv4, IPv6 and NSH EIDs (payloads)
+  - Map-resolver failover algorithm
+description: "LISP control plane implementation"
+state: production
+properties: [API, CLI, STATS, MULTITHREAD]
diff --git a/src/vnet/lisp-gpe/FEATURE.yaml b/src/vnet/lisp-gpe/FEATURE.yaml
new file mode 100644
index 0000000..fb051e3
--- /dev/null
+++ b/src/vnet/lisp-gpe/FEATURE.yaml
@@ -0,0 +1,11 @@
+---
+name: Locator/ID Separation Protocol Generic Protocol Extension (LISP-GPE)
+maintainer: Florin Coras <fcoras@cisco.com>
+features:
+  - ITR, ETR and RTR modes
+  - Support for Ethernet, IPv4, IPv6 and NSH EIDs (payloads)
+  - Source/dest forwarding
+  - IPv4 and IPv6 RLOCs
+description: "LISP-GPE implementation"
+state: production
+properties: [API, CLI, STATS, MULTITHREAD]