diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
new file mode 100644
index 00000000000..dc4dc143a53
--- /dev/null
+++ b/benchmarks/netpipe/Makefile
@@ -0,0 +1,19 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1999/03/19 05:22:31 brad Exp $
+# $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
+
+DISTNAME=	netpipe-2.3
+CATEGORIES=	benchmarks net
+MASTER_SITES=	ftp://ftp.ameslab.gov/pub/netpipe/ \
+		http://www.freebsd.org/~jkoshy/PORTS/
+
+MAINTAINER=	brad@openbsd.org
+
+ALL_TARGET=	NPtcp
+MAN1=		netpipe.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${PREFIX}/bin/NPtcp
+	@${LN} -fs ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
+	${INSTALL_DATA} ${WRKSRC}/netpipe.1 ${PREFIX}/man/man1/netpipe.1
+
+.include <bsd.port.mk>
diff --git a/benchmarks/netpipe/files/md5 b/benchmarks/netpipe/files/md5
new file mode 100644
index 00000000000..000ea5ff65c
--- /dev/null
+++ b/benchmarks/netpipe/files/md5
@@ -0,0 +1,3 @@
+MD5 (netpipe-2.3.tar.gz) = cf166ac7ccab491cd68ef75e0e6f466d
+RMD160 (netpipe-2.3.tar.gz) = 40074a5f71567c7c4ad373839af436eaf6d42491
+SHA1 (netpipe-2.3.tar.gz) = 7ae6372899a38b1dea1f46b57549da5413f38609
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-aa
new file mode 100644
index 00000000000..121e06b577d
--- /dev/null
+++ b/benchmarks/netpipe/patches/patch-aa
@@ -0,0 +1,13 @@
+--- netpipe.h.orig	Thu Mar 18 23:15:21 1999
++++ netpipe.h	Thu Mar 18 23:16:33 1999
+@@ -37,8 +37,10 @@
+ #define  MAXINT             2147483647
+ 
+ #define     ABS(x)     (((x) < 0)?(-(x)):(x))
++#ifndef __OpenBSD__
+ #define     MIN(x,y)   (((x) < (y))?(x):(y))
+ #define     MAX(x,y)   (((x) > (y))?(x):(y))
++#endif
+ 
+ /* Need to include the protocol structure header file.                       */
+ /* Change this to reflect the protocol                                       */
diff --git a/benchmarks/netpipe/pkg/COMMENT b/benchmarks/netpipe/pkg/COMMENT
new file mode 100644
index 00000000000..03929d14a48
--- /dev/null
+++ b/benchmarks/netpipe/pkg/COMMENT
@@ -0,0 +1 @@
+a self-scaling network benchmark
diff --git a/benchmarks/netpipe/pkg/DESCR b/benchmarks/netpipe/pkg/DESCR
new file mode 100644
index 00000000000..afc3d4e79f5
--- /dev/null
+++ b/benchmarks/netpipe/pkg/DESCR
@@ -0,0 +1,17 @@
+NetPIPE is a protocol independent performance tool that encapsulates
+the best of ttcp and netperf and visually represents the network
+performance under a variety of conditions. By taking the end-to-end
+application view of a network, NetPIPE clearly shows the overhead
+associated with different protocol layers. Netpipe answers such
+questions as: how soon will a given data block of size k arrive at its
+destination? Which network and protocol will transmit size k blocks
+the fastest? What is a given network's effective maximum throughput
+and saturation level?  Does there exist a block size k for which the
+throughput is maximized? How much communication overhead is due to the
+network communication protocol layer(s)? How quickly will a small (< 1
+kbyte) control message arrive, and which network and protocol are best
+for this purpose?
+
+For a paper fully describing NetPIPE and sample investigation of
+network performance issues using NetPIPE, see
+http://www.scl.ameslab.gov/netpipe/paper/full.html.
diff --git a/benchmarks/netpipe/pkg/PLIST b/benchmarks/netpipe/pkg/PLIST
new file mode 100644
index 00000000000..6ff6c867bf5
--- /dev/null
+++ b/benchmarks/netpipe/pkg/PLIST
@@ -0,0 +1,3 @@
+bin/NPtcp
+bin/netpipe
+man/man1/netpipe.1