diff --git a/ChangeLog b/ChangeLog
index f9eb6520..27d4c1b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21  James Lentini <jlentini@netapp.com>
+	
+	* Increase size of hw address allowed for ip neigh to allow
+	  for IB.
+
 2006-03-14  Russell Stuart <russell-lartc@stuart.id.au>
 	
 	* Fix missing memset in tc sample
diff --git a/ip/iplink.c b/ip/iplink.c
index 77b1eeae..ffc9f063 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -216,7 +216,8 @@ static int get_address(const char *dev, int *htype)
 	return me.sll_halen;
 }
 
-static int parse_address(const char *dev, int hatype, int halen, char *lla, struct ifreq *ifr)
+static int parse_address(const char *dev, int hatype, int halen, 
+		char *lla, struct ifreq *ifr)
 {
 	int alen;
 
diff --git a/ip/ipneigh.c b/ip/ipneigh.c
index 9e12befc..249ee680 100644
--- a/ip/ipneigh.c
+++ b/ip/ipneigh.c
@@ -165,7 +165,7 @@ static int ipneigh_modify(int cmd, int flags, int argc, char **argv)
 	addattr_l(&req.n, sizeof(req), NDA_DST, &dst.data, dst.bytelen);
 
 	if (lla && strcmp(lla, "null")) {
-		char llabuf[16];
+		char llabuf[20];
 		int l;
 
 		l = ll_addr_a2n(llabuf, sizeof(llabuf), lla);