diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 1b8ada2f1e35..ba409cbcfacb 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -4,25 +4,30 @@
 #
 # $FreeBSD$
 
-PORTNAME=	netpipe
-PORTVERSION=	2.4
+PORTNAME=	NetPIPE
+PORTVERSION=	3.2
 CATEGORIES=	benchmarks net
-MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=jkoshy
+MASTER_SITES=	http://www.scl.ameslab.gov/Projects/Netpipe/code/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jkoshy@freebsd.org
 
-# The default port builds and installs only the TCP version of
-# netpipe(1).  The sources also support PVM and MPI.
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKEFILE=	makefile
 
-ALL_TARGET=	NPtcp
-MAN1=		netpipe.1
-MLINKS=		netpipe.1 NPtcp.1
-MANCOMPRESSED=	no
+# The default port builds and installs only the TCP version of
+# netpipe(1).  The sources support many other variants.
+
+ALL_TARGET=	tcp
+DOCS=		README netpipe_paper.ps
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${PREFIX}/bin/NPtcp
-	${INSTALL_DATA} ${WRKSRC}/netpipe.1 ${PREFIX}/man/man1/netpipe.1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/netpipe
+.for doc in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/dox/${doc} ${PREFIX}/share/doc/netpipe/${doc}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/netpipe/distinfo b/benchmarks/netpipe/distinfo
index 2c4770c302d1..294a078d605f 100644
--- a/benchmarks/netpipe/distinfo
+++ b/benchmarks/netpipe/distinfo
@@ -1 +1 @@
-MD5 (netpipe-2.4.tar.gz) = 0a3a868a122b526a7adeea08ca3422ee
+MD5 (NetPIPE_3.2.tar.gz) = ef22a3024bf408c08fe74a6d7fca08e2
diff --git a/benchmarks/netpipe/files/patch-aa b/benchmarks/netpipe/files/patch-aa
index 4a1c966ffaeb..9022b2517c26 100644
--- a/benchmarks/netpipe/files/patch-aa
+++ b/benchmarks/netpipe/files/patch-aa
@@ -1,20 +1,13 @@
---- Makefile.orig	Sat Jan 22 14:47:22 2000
-+++ Makefile	Sat Jan 22 14:47:33 2000
-@@ -4,7 +4,7 @@
+--- makefile--	Mon Oct  7 10:33:20 2002
++++ makefile	Mon Oct  7 10:33:26 2002
+@@ -20,8 +20,8 @@
  #
+ ########################################################################
  
- # Default C compiler: must be an ANSI C compiler
 -CC         = cc
+-CFLAGS     = -O
 +CC         ?= cc
- # File names for the main source files
- DRIV_SRC   = netpipe.c
- DRIV_OBJ   = netpipe.o
-@@ -13,7 +13,7 @@
- TARGETS    = NPtcp
- # If you have TCP, MPI and PVM
- #TARGETS    = NPtcp NPmpi NPpvm
--CFLAGS	   = -O
-+CFLAGS	   ?= -O
- # Adjust these for MPI (only used if you have MPI)
- MPI_HOME   = /home/mpich
- MPI_ARCH   = IRIX
++CFLAGS     ?= -O
+ SRC        = ./src
+ 
+ # For MPI, mpicc will set up the proper include and library paths
diff --git a/benchmarks/netpipe/pkg-plist b/benchmarks/netpipe/pkg-plist
index 2eff3d87e544..448d476944a0 100644
--- a/benchmarks/netpipe/pkg-plist
+++ b/benchmarks/netpipe/pkg-plist
@@ -1 +1,4 @@
 bin/NPtcp
+%%PORTDOCS%%share/doc/netpipe/README
+%%PORTDOCS%%share/doc/netpipe/netpipe_paper.ps
+%%PORTDOCS%%@dirrm share/doc/netpipe