diff --git a/net/arp-scan/Makefile b/net/arp-scan/Makefile
index c0adf1f6fe8..c76dd9e2a07 100644
--- a/net/arp-scan/Makefile
+++ b/net/arp-scan/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/10/07 10:01:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2009/06/26 09:20:41 sthen Exp $
 
 COMMENT =	ARP scanning and fingerprinting tool
 DISTNAME =	arp-scan-1.7
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	net
 
 HOMEPAGE =	http://www.nta-monitor.com/tools/arp-scan/
diff --git a/net/arp-scan/patches/patch-link-bpf_c b/net/arp-scan/patches/patch-link-bpf_c
new file mode 100644
index 00000000000..4d131a0d333
--- /dev/null
+++ b/net/arp-scan/patches/patch-link-bpf_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-link-bpf_c,v 1.1 2009/06/26 09:20:41 sthen Exp $
+--- link-bpf.c.orig	Thu Jul 17 13:01:14 2008
++++ link-bpf.c	Fri Jun 26 10:16:27 2009
+@@ -253,6 +253,10 @@ get_hardware_address(link_t *handle, unsigned char hw_
+  */
+    for (p = buf; p < buf + len; p += ifm->ifm_msglen) {
+       ifm = (struct if_msghdr *)p;
++
++      if (ifm->ifm_version != RTM_VERSION)
++         continue;
++
+       sdl = (struct sockaddr_dl *)(ifm + 1);
+ 
+       if (ifm->ifm_type != RTM_IFINFO || (ifm->ifm_addrs & RTA_IFP) == 0)