diff --git a/src/devices/p2p/p2p-net-device.cc b/src/devices/p2p/p2p-net-device.cc
index a71f275f6..1677e426a 100644
--- a/src/devices/p2p/p2p-net-device.cc
+++ b/src/devices/p2p/p2p-net-device.cc
@@ -44,7 +44,6 @@ PointToPointNetDevice::PointToPointNetDevice(Node* node) :
   EnableBroadcast (MacAddress ("ff:ff:ff:ff:ff:ff"));
   EnableMulticast();
   EnablePointToPoint();
-  SetMtu(512); // bytes
 
   m_phy = new PointToPointPhy(node, this);
 }
diff --git a/src/node/net-device.cc b/src/node/net-device.cc
index b935bddbb..3f8e076d0 100644
--- a/src/node/net-device.cc
+++ b/src/node/net-device.cc
@@ -35,7 +35,7 @@ NetDevice::NetDevice(Node *node, const MacAddress& addr) :
   m_name(""), 
   m_ifIndex (0), 
   m_address (addr),
-  m_mtu (0), 
+  m_mtu (0xffff), 
   m_isUp (false), 
   m_isBroadcast (false), 
   m_isMulticast (false),