diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 84070031570..4a6f16f0189 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2014/09/25 17:33:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.115 2015/09/11 15:57:42 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,6 +6,7 @@ COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
 
 MODPY_EGG_VERSION=	6.47
+REVISION-main=		0
 DISTNAME=		nmap-${MODPY_EGG_VERSION}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-zenmap=		nmap-zenmap-${MODPY_EGG_VERSION}
diff --git a/net/nmap/patches/patch-libpcap_pcap-bpf_c b/net/nmap/patches/patch-libpcap_pcap-bpf_c
new file mode 100644
index 00000000000..7d60be60c91
--- /dev/null
+++ b/net/nmap/patches/patch-libpcap_pcap-bpf_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-libpcap_pcap-bpf_c,v 1.1 2015/09/11 15:57:42 sthen Exp $
+--- libpcap/pcap-bpf.c.orig	Fri Sep 11 09:54:04 2015
++++ libpcap/pcap-bpf.c	Fri Sep 11 09:54:42 2015
+@@ -2265,7 +2265,7 @@ monitor_mode(pcap_t *p, int set)
+ {
+ 	int sock;
+ 	struct ifmediareq req;
+-	int *media_list;
++	uint64_t *media_list;
+ 	int i;
+ 	int can_do;
+ 	struct ifreq ifr;
+@@ -2322,7 +2322,7 @@ monitor_mode(pcap_t *p, int set)
+ 	 * Allocate a buffer to hold all the media types, and
+ 	 * get the media types.
+ 	 */
+-	media_list = malloc(req.ifm_count * sizeof(int));
++	media_list = malloc(req.ifm_count * sizeof(uint64_t));
+ 	if (media_list == NULL) {
+ 		snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "malloc: %s",
+ 		    pcap_strerror(errno));