diff --git a/src/vnet/gre/gre.api b/src/vnet/gre/gre.api
index cb0bb73..d79beeb 100644
--- a/src/vnet/gre/gre.api
+++ b/src/vnet/gre/gre.api
@@ -14,20 +14,30 @@
  * limitations under the License.
  */
 
-option version = "2.0.0";
+option version = "2.0.1";
 
 import "vnet/interface_types.api";
 import "vnet/ip/ip_types.api";
 
 /** \brief A GRE tunnel type
 */
-enum gre_tunnel_type
+enum gre_tunnel_type : u8
 {
   GRE_API_TUNNEL_TYPE_L3 = 0,
   GRE_API_TUNNEL_TYPE_TEB,
   GRE_API_TUNNEL_TYPE_ERSPAN,
 };
 
+/** \brief A GRE tunnel mode
+*/
+enum gre_tunnel_mode : u8
+{
+  /* point-to-point */
+  GRE_API_TUNNEL_MODE_P2P,
+  /* multi-point */
+  GRE_API_TUNNEL_MODE_MP,
+};
+
 /** \brief A GRE tunnel
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -35,18 +45,17 @@
     @param instance - optional unique custom device instance, else ~0.
     @param src - Source IP address
     @param dst - Destination IP address, can be multicast
-    @param outer_fib_id - Encap FIB table ID
+    @param outer_table_id - Encap FIB table ID
     @param session_id - session for ERSPAN tunnel, range 0-1023
     @param sw_if_index - ignored on create/delete, present in details.
 */
 typedef gre_tunnel
 {
-  u32 client_index;
-  u32 context;
-  u16 session_id;
   vl_api_gre_tunnel_type_t type;
+  vl_api_gre_tunnel_mode_t mode;
+  u16 session_id;
   u32 instance;
-  u32 outer_fib_id;
+  u32 outer_table_id;
   vl_api_interface_index_t sw_if_index;
   vl_api_address_t src;
   vl_api_address_t dst;