diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index ed7a7d5..3d27827 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -322,7 +322,8 @@
 #define LOCI_SHOW_u16_subtype(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
 #define LOCI_SHOW_u32_ipv4_addr(writer, cookie, val) LOCI_SHOW_ipv4(writer, cookie, val)
 #define LOCI_SHOW_u32_ipv4_netmask(writer, cookie, val) LOCI_SHOW_ipv4(writer, cookie, val)
-
+#define LOCI_SHOW_u8_l2_table_enable(writer, cookie, val) LOCI_SHOW_u8(writer, cookie, val)
+#define LOCI_SHOW_u16_l2_table_priority(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
 
 
 
diff --git a/loxi_front_end/type_maps.py b/loxi_front_end/type_maps.py
index 23452d3..5f58eb3 100644
--- a/loxi_front_end/type_maps.py
+++ b/loxi_front_end/type_maps.py
@@ -796,6 +796,9 @@
             "of_bsn_get_interfaces_request"  : 9,
             "of_bsn_get_interfaces_reply"    : 10,
             "of_bsn_set_pktin_suppression"   : 11,
+            "of_bsn_set_l2_table"            : 12,
+            "of_bsn_get_l2_table_request"    : 13,
+            "of_bsn_get_l2_table_reply"      : 14,
             },
         nicira = {   # Nicira extensions, value is subtype
             "of_nicira_controller_role_request"      : 10,
diff --git a/openflow_input/bsn_l2_table b/openflow_input/bsn_l2_table
new file mode 100644
index 0000000..28a3f34
--- /dev/null
+++ b/openflow_input/bsn_l2_table
@@ -0,0 +1,68 @@
+// Copyright 2013, 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 1
+
+// BSN L2 table configuration messages
+struct ofp_bsn_set_l2_table {
+    uint8_t version;
+    uint8_t type;
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;    // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;   // BSN_L2_TABLE_SET
+    uint8_t l2_table_enable;    // 1 == enabled, 0 == disabled
+    uint8_t pad;
+    uint16_t l2_table_priority;  // priority of all flows in L2 table
+    uint8_t[4] pad;
+};
+
+struct ofp_bsn_get_l2_table_request {
+    uint8_t version;
+    uint8_t type;
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;    // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;   // BSN_L2_TABLE_GET_REQUEST
+    uint8_t l2_table_enable;    // 1 == enabled, 0 == disabled
+    uint8_t pad;
+    uint16_t l2_table_priority;  // priority of all flows in L2 table
+    uint8_t[4] pad;
+};
+
+struct ofp_bsn_get_l2_table_reply {
+    uint8_t version;
+    uint8_t type;
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;    // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;   // BSN_L2_TABLE_GET_REPLY
+    uint8_t l2_table_enable;    // 1 == enabled, 0 == disabled
+    uint8_t pad;
+    uint16_t l2_table_priority;  // priority of all flows in L2 table
+    uint8_t[4] pad;
+};