diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index ff53529..2fced18 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -195,6 +195,8 @@
     adj->ia_link = link_type;
     adj->ia_nh_proto = nh_proto;
     adj->rewrite_header.sw_if_index = sw_if_index;
+    vnet_rewrite_update_mtu(vnet_get_main(), adj->ia_link,
+                            &adj->rewrite_header);
 
     adj_nbr_evaluate_feature (adj_get_index(adj));
     return (adj);
diff --git a/src/vnet/adj/rewrite.c b/src/vnet/adj/rewrite.c
index 1a87793..975dc4a 100644
--- a/src/vnet/adj/rewrite.c
+++ b/src/vnet/adj/rewrite.c
@@ -166,7 +166,8 @@
   rw->sw_if_index = tx_sw_if_index;
   rw->next_index = vlib_node_add_next (vnm->vlib_main, rewrite_node_index,
 				       post_rewrite_node_index);
-  rw->max_l3_packet_bytes = (u16) ~ 0;	/* we can't know at this point */
+  /* we can't know at this point */
+  rw->max_l3_packet_bytes = (u16) ~ 0;
 
   ASSERT (rewrite_length < sizeof (adj->rewrite_data));
   /* Leave room for ethernet + VLAN tag */