diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 7fbc72dea1b..f66b121fb4c 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.27 2000/09/08 23:28:12 brad Exp $
+# $OpenBSD: Makefile,v 1.28 2000/10/09 22:08:16 avsm Exp $
 
-DISTNAME=	nmap-2.54BETA4
-PKGNAME=	nmap-2.54b4
+DISTNAME=	nmap-2.54BETA6
+PKGNAME=	nmap-2.54b6
 CATEGORIES=	net security
-NEED_VERSION=	1.320
+NEED_VERSION=	1.338
 MASTER_SITES=	http://www.insecure.org/nmap/dist/
 EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://www.insecure.org/nmap/
-
-MAINTAINER=	angelos@openbsd.org
+MAINTAINER=	Angelos Keromytis <angelos@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,10 +16,16 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MAKE_FLAGS=	CCOPT="${CFLAGS}"
-
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--no-recursion
-
 ALL_TARGET=	nmap
+NMAP_FILES=	os-fingerprints protocols rpc services
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/nmap
+	${INSTALL_PROGRAM} ${WRKBUILD}/nmap ${PREFIX}/bin
+	${INSTALL_MAN}	${WRKBUILD}/docs/nmap.1 ${PREFIX}/man/man1
+.	for i in ${NMAP_FILES}
+	${INSTALL_DATA} ${WRKSRC}/nmap-$i ${PREFIX}/share/nmap
+.	endfor
 
 .include <bsd.port.mk>
diff --git a/net/nmap/files/md5 b/net/nmap/files/md5
index ab4d9d2ab4d..72bb508cd2b 100644
--- a/net/nmap/files/md5
+++ b/net/nmap/files/md5
@@ -1,3 +1,3 @@
-MD5 (nmap-2.54BETA4.tgz) = d8ef19e84b6238685004616482ef63c6
-RMD160 (nmap-2.54BETA4.tgz) = 3d3bac7540d4217158b3b7baf12eedf47aa7c14c
-SHA1 (nmap-2.54BETA4.tgz) = 89b910dfde7344922a7d8bfd534b16cbc3391447
+MD5 (nmap-2.54BETA6.tgz) = e6faa7e14b20f554611f622bbfdf6948
+RMD160 (nmap-2.54BETA6.tgz) = cbdcc050ab8b3326abdce22697c8256a263794e1
+SHA1 (nmap-2.54BETA6.tgz) = fd8822697244cdd346b286257b4539b55628e9f6
diff --git a/net/nmap/patches/patch-Makefile.in b/net/nmap/patches/patch-Makefile.in
deleted file mode 100644
index 3b8910c53b9..00000000000
--- a/net/nmap/patches/patch-Makefile.in
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile.in.orig	Tue Sep  5 01:00:57 2000
-+++ Makefile.in	Fri Sep  8 19:02:24 2000
-@@ -11,12 +11,14 @@
- nmapdatadir = @datadir@/nmap
- deskdir = $(prefix)/share/gnome/apps/Utilities
- 
-+DESTDIR = 
-+
- CC = @CC@
- CCOPT = 
- LIBPCAPDIR = @libpcapdir@
- INCLS = -I$(LIBPCAPDIR)
- DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
--CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
-+CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
- STATIC = 
- LDFLAGS = @LDFLAGS@ $(STATIC)
-@@ -39,7 +41,7 @@
- 
- all: $(TARGET) nmapfe/nmapfe
- 
--$(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS)
-+$(TARGET): $(DEPS) $(OBJS)
- 	@echo Compiling nmap
- 	rm -f $@
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-@@ -144,15 +146,13 @@
- 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
- 
- install: $(TARGET)
--	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
--	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
--	@echo "If the next command fails -- you cannot use the X front end"
--	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1
--	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(mandir)/man1/$(TARGET).1
--	$(INSTALL) -c -m 644 nmap-os-fingerprints  $(nmapdatadir)/nmap-os-fingerprints
--	$(INSTALL) -c -m 644 nmap-services  $(nmapdatadir)/nmap-services
--	$(INSTALL) -c -m 644 nmap-protocols  $(nmapdatadir)/nmap-protocols
--	$(INSTALL) -c -m 644 nmap-rpc  $(nmapdatadir)/nmap-rpc
-+	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
-+	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
-+	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
-+	$(INSTALL) -c -m 644 nmap-os-fingerprints $(DESTDIR)$(nmapdatadir)/nmap-os-fingerprints
-+	$(INSTALL) -c -m 644 nmap-services $(DESTDIR)$(nmapdatadir)/nmap-services
-+	$(INSTALL) -c -m 644 nmap-protocols $(DESTDIR)$(nmapdatadir)/nmap-protocols
-+	$(INSTALL) -c -m 644 nmap-rpc $(DESTDIR)$(nmapdatadir)/nmap-rpc
- 
- uninstall:
- 	rm -f $(bindir)/$(TARGET) $(bindir)/nmapfe $(bindir)/xnmap