diff --git a/c_gen/c_match.py b/c_gen/c_match.py
index 7fd6a21..aada0cd 100644
--- a/c_gen/c_match.py
+++ b/c_gen/c_match.py
@@ -290,6 +290,7 @@
     OF_OXM_INDEX_IPV6_ND_TLL    = 33, /* Target link-layer for ND. */
     OF_OXM_INDEX_MPLS_LABEL     = 34, /* MPLS label. */
     OF_OXM_INDEX_MPLS_TC        = 35, /* MPLS TC. */
+    OF_OXM_INDEX_TUNNEL_ID      = 38, /* Logical Port Metadata. */
 
     OF_OXM_INDEX_BSN_IN_PORTS_128 = 36,
     OF_OXM_INDEX_BSN_LAG_ID = 37,
diff --git a/c_gen/match.py b/c_gen/match.py
index d9fdee5..908a0e4 100644
--- a/c_gen/match.py
+++ b/c_gen/match.py
@@ -396,6 +396,15 @@
         order=601,
         ),
 
+    tunnel_id = dict(
+        name="tunnel_id",
+        m_type="uint64_t",
+        print_type="PRIu64",
+        conditions="",
+        takes_mask_in_spec=True,
+        order=700,
+        ),
+
     bsn_in_ports_128 = dict(
         name="bsn_in_ports_128",
         m_type="of_bitmap_128_t",
diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index 909df71..012423b 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -85,6 +85,7 @@
 #define LOCI_SHOW_mac_eth_dst(writer, cookie, val)         LOCI_SHOW_mac(writer, cookie, val)
 #define LOCI_SHOW_mac_ipv6_nd_sll(writer, cookie, val)     LOCI_SHOW_mac(writer, cookie, val)
 #define LOCI_SHOW_u8_mpls_tc(writer, cookie, val)          LOCI_SHOW_x8(writer, cookie, val)
+#define LOCI_SHOW_u64_tunnel_id(writer, cookie, val)       LOCI_SHOW_u64(writer, cookie, val)
 #define LOCI_SHOW_u16_arp_op(writer, cookie, val)          LOCI_SHOW_u16(writer, cookie, val)
 #define LOCI_SHOW_u16_eth_type(writer, cookie, val)        LOCI_SHOW_x16(writer, cookie, val)
 #define LOCI_SHOW_ipv6_ipv6_nd_target(writer, cookie, val) LOCI_SHOW_ipv6(writer, cookie, val)
diff --git a/openflow_input/oxm-1.2 b/openflow_input/oxm-1.2
index 4eed2ef..5006cff 100644
--- a/openflow_input/oxm-1.2
+++ b/openflow_input/oxm-1.2
@@ -431,14 +431,3 @@
     uint16_t value;
     uint16_t value_mask;
 };
-
-struct of_oxm_tunnel_id : of_oxm {
-    uint32_t type_len == 0x80004c08;
-    uint64_t value;
-};
-
-struct of_oxm_tunnel_id_masked : of_oxm {
-    uint32_t type_len == 0x80004d10;
-    uint64_t value;
-    uint64_t value_mask;
-};
diff --git a/openflow_input/oxm-1.3 b/openflow_input/oxm-1.3
new file mode 100644
index 0000000..2dbab42
--- /dev/null
+++ b/openflow_input/oxm-1.3
@@ -0,0 +1,42 @@
+// Copyright 2014, Big Switch Networks, Inc.
+//
+// LoxiGen is licensed under the Eclipse Public License,
+// version 1.0 (EPL), with the following special exception:
+//
+// LOXI Exception
+//
+// As a special exception to the terms of the EPL, you may
+// distribute libraries generated by LoxiGen (LoxiGen Libraries)
+// under the terms of your choice, provided that copyright and
+// licensing notices generated by LoxiGen are not altered or removed
+// from the LoxiGen Libraries and the notice provided below is (i)
+// included in the LoxiGen Libraries, if distributed in source code
+// form and (ii) included in any documentation for the LoxiGen
+// Libraries, if distributed in binary form.
+//
+// Notice: "Copyright 2013, Big Switch Networks, Inc.
+// This library was generated by the LoxiGen Compiler."
+//
+// You may not use this file except in compliance with the EPL or
+// LOXI Exception. You may obtain a copy of the EPL at:
+//
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an "AS
+// IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the EPL for the specific language
+// governing permissions and limitations under the EPL.
+
+#version 4
+
+struct of_oxm_tunnel_id : of_oxm {
+    uint32_t type_len == 0x80004c08;
+    uint64_t value;
+};
+
+struct of_oxm_tunnel_id_masked : of_oxm {
+    uint32_t type_len == 0x80004d10;
+    uint64_t value;
+    uint64_t value_mask;
+};