diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index fea0ed825b7..1bf6a3c364e 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.70 2007/05/30 07:18:50 rui Exp $
+# $OpenBSD: Makefile,v 1.71 2007/06/19 18:10:26 rui Exp $
 
 COMMENT=	"scan ports and fingerprint stack of network hosts"
 
-DISTNAME=	nmap-4.11
-PKGNAME=	${DISTNAME}p2
+DISTNAME=	nmap-4.20
 CATEGORIES=	net security
 MASTER_SITES=	${HOMEPAGE}dist/
 EXTRACT_SUFX=	.tgz
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 16690022acc..708e59dcfc8 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,5 +1,5 @@
-MD5 (nmap-4.11.tgz) = B+aLHEqFrZAS9ou676nOHw==
-RMD160 (nmap-4.11.tgz) = 1ckD8BpeQHX0MVF7uRiIF9MGFPI=
-SHA1 (nmap-4.11.tgz) = PcydH7XvKDbBmVEOpjk+WUuFz7E=
-SHA256 (nmap-4.11.tgz) = n+mNXYyIZ8RKMHwhJ3BDsvk9UPHXU+DSMTNQem0Vmac=
-SIZE (nmap-4.11.tgz) = 2660928
+MD5 (nmap-4.20.tgz) = k+OytrEQkqWHxptnzydVXw==
+RMD160 (nmap-4.20.tgz) = sUGjWtwFFxvywXZRllm/DQQ3IjA=
+SHA1 (nmap-4.20.tgz) = jSli8Dcd5s+kZvbOI4nkDKW+JEM=
+SHA256 (nmap-4.20.tgz) = 7ssnavDX5jUw+S7ZJLJfNM4HMbnLqosWy+cXkHe5MVk=
+SIZE (nmap-4.20.tgz) = 2704981
diff --git a/net/nmap/patches/patch-configure b/net/nmap/patches/patch-configure
new file mode 100644
index 00000000000..ff1659050ea
--- /dev/null
+++ b/net/nmap/patches/patch-configure
@@ -0,0 +1,11 @@
+$OpenBSD: patch-configure,v 1.3 2007/06/19 18:10:26 rui Exp $
+--- configure.orig	Mon Jun 18 14:27:25 2007
++++ configure	Mon Jun 18 14:28:29 2007
+@@ -5879,6 +5879,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ extern char pcap_version[];
+ int main() {
+   int major, minor1, minor2;
++  exit(0); /* fool it, use our libpcap */
+   sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
+   if (major > 0)
+     exit(0);
diff --git a/net/nmap/patches/patch-tcpip_cc b/net/nmap/patches/patch-tcpip_cc
new file mode 100644
index 00000000000..fbfcd13085a
--- /dev/null
+++ b/net/nmap/patches/patch-tcpip_cc
@@ -0,0 +1,12 @@
+$OpenBSD: patch-tcpip_cc,v 1.5 2007/06/19 18:10:26 rui Exp $
+--- tcpip.cc.orig	Mon Jun 18 14:41:30 2007
++++ tcpip.cc	Mon Jun 18 14:44:56 2007
+@@ -1972,7 +1972,7 @@ bool pcap_selectable_fd_valid() {
+    results.  If you just want to test whether the function is supported,
+    use pcap_selectable_fd_valid() instead. */
+ int my_pcap_get_selectable_fd(pcap_t *p) {
+-#if defined(WIN32) || defined(MACOSX)
++#if defined(WIN32) || defined(MACOSX) || defined __OpenBSD__
+   return -1;
+ #else
+   assert(pcap_selectable_fd_valid());
diff --git a/net/nmap/pkg/PLIST b/net/nmap/pkg/PLIST
index 705edef7eb0..eafa0f3856c 100644
--- a/net/nmap/pkg/PLIST
+++ b/net/nmap/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.13 2005/02/08 19:06:42 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.14 2007/06/19 18:10:26 rui Exp $
 bin/nmap
 @man man/man1/nmap.1
 share/nmap/
 share/nmap/nmap-mac-prefixes
+share/nmap/nmap-os-db
 share/nmap/nmap-os-fingerprints
 share/nmap/nmap-protocols
 share/nmap/nmap-rpc