diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
index ad365c6bd..099c6d882 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
@@ -222,6 +222,14 @@ private MatchField(final String name, final MatchFields id, Prerequisite<?>... p
             new MatchField<IPv4Address>("tunnel_ipv4_dst", MatchFields.TUNNEL_IPV4_DST,
                     new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv4));
 
+    public final static MatchField<IPv6Address> TUNNEL_IPV6_SRC =
+            new MatchField<IPv6Address>("tunnel_ipv6_src", MatchFields.TUNNEL_IPV6_SRC,
+                    new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv6));
+
+    public final static MatchField<IPv6Address> TUNNEL_IPV6_DST =
+            new MatchField<IPv6Address>("tunnel_ipv6_dst", MatchFields.TUNNEL_IPV6_DST,
+                    new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv6));
+
     public final static MatchField<OFBitMask128> BSN_IN_PORTS_128 =
             new MatchField<OFBitMask128>("bsn_in_ports_128", MatchFields.BSN_IN_PORTS_128);
 
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
index 33de568d2..74a9a4bda 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
@@ -49,6 +49,8 @@ public enum MatchFields {
     ACTSET_OUTPUT,
     TUNNEL_IPV4_SRC,
     TUNNEL_IPV4_DST,
+    TUNNEL_IPV6_SRC,
+    TUNNEL_IPV6_DST,
     BSN_IN_PORTS_128,
     BSN_IN_PORTS_512,
     BSN_LAG_ID,
diff --git a/openflow_input/oxm_nicira_tun b/openflow_input/oxm_nicira_tun
index 6238aae0e..936057cc0 100644
--- a/openflow_input/oxm_nicira_tun
+++ b/openflow_input/oxm_nicira_tun
@@ -53,3 +53,27 @@ struct of_oxm_tunnel_ipv4_dst_masked : of_oxm {
     of_ipv4_t value;
     of_ipv4_t value_mask;
 };
+
+// Nicira extension for tun_ipv6_src
+struct of_oxm_tunnel_ipv6_src : of_oxm {
+    uint32_t type_len == 0x0001da10;
+    of_ipv6_t value;
+};
+
+struct of_oxm_tunnel_ipv6_src_masked : of_oxm {
+    uint32_t type_len == 0x0001db20;
+    of_ipv6_t value;
+    of_ipv6_t value_mask;
+};
+
+// Nicira extension for tun_ipv6_dst
+struct of_oxm_tunnel_ipv6_dst : of_oxm {
+    uint32_t type_len == 0x0001dc10;
+    of_ipv6_t value;
+};
+
+struct of_oxm_tunnel_ipv6_dst_masked : of_oxm {
+    uint32_t type_len == 0x0001dd20;
+    of_ipv6_t value;
+    of_ipv6_t value_mask;
+};