diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index f319272a2d8..db45b927189 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -2,17 +2,16 @@ COMMENT=	shell utilities to connect programs to sockets
 
 DISTNAME=	netpipes-4.2-export
 PKGNAME=	netpipes-4.2
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net
 
 HOMEPAGE=	http://web.purplefrog.com/~thoth/netpipes/netpipes.html
 
 PERMIT_PACKAGE=	Yes
-WANTLIB=		c
+WANTLIB=	c
 
-SITES=		ftp://ftp.purplefrog.com/pub/netpipes/
-
-WRKDIST=	${WRKDIR}
+SITES=		http://web.purplefrog.com/~thoth/netpipes/ftp/
+DISTFILES=	${DISTNAME}-1{${DISTNAME}}.tar.gz
 
 NO_TEST=	Yes
 
diff --git a/net/netpipes/distinfo b/net/netpipes/distinfo
index 6495f49aa64..b32e88be6ce 100644
--- a/net/netpipes/distinfo
+++ b/net/netpipes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netpipes-4.2-export.tar.gz) = bu2JtmGunyrA04NBTKlkq+qKEV+Pug96s3tJtWX/sqg=
-SIZE (netpipes-4.2-export.tar.gz) = 74977
+SHA256 (netpipes-4.2-export-1.tar.gz) = BxKyzVWteAhDhdIV+AN6rTxTsGpv2Mm9qD7COv1ECic=
+SIZE (netpipes-4.2-export-1.tar.gz) = 75276
diff --git a/net/netpipes/patches/patch-Makefile b/net/netpipes/patches/patch-Makefile
index a0554df0a58..5ca3eb6e455 100644
--- a/net/netpipes/patches/patch-Makefile
+++ b/net/netpipes/patches/patch-Makefile
@@ -1,5 +1,6 @@
---- Makefile.orig	Wed Oct 28 20:30:03 1998
-+++ Makefile	Wed Mar 21 22:11:23 2001
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -17,7 +17,7 @@
  
  # You probably want to change this:
@@ -18,7 +19,7 @@
  
  # SGI
  #CFLAGS = -DSYSV $(CDEBUGFLAGS)
-@@ -71,7 +71,7 @@ CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_
+@@ -71,7 +71,7 @@ CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CD
  #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
  
  # FreeBSD
diff --git a/net/netpipes/patches/patch-faucet_c b/net/netpipes/patches/patch-faucet_c
new file mode 100644
index 00000000000..dc12808d1b8
--- /dev/null
+++ b/net/netpipes/patches/patch-faucet_c
@@ -0,0 +1,15 @@
+Casts the socket address union pointer to struct sockaddr * to fix a compiler
+type mismatch
+
+Index: faucet.c
+--- faucet.c.orig
++++ faucet.c
+@@ -619,7 +619,7 @@ char ** argv;
+       continue;
+     }
+     
+-    if (!authorize_address(&saddr)) {
++    if (!authorize_address((struct sockaddr *)&saddr)) {
+       close(rval);
+       continue;
+     }
diff --git a/net/netpipes/pkg/DESCR b/net/netpipes/pkg/DESCR
index 1bd91f89776..226b630f6f8 100644
--- a/net/netpipes/pkg/DESCR
+++ b/net/netpipes/pkg/DESCR
@@ -2,6 +2,6 @@ Netpipes is a collection of utilities which attempts to provide the
 functionality of pipes over a network.
 
 It consists of small utilities that perform a single task, such as
-listening on a port for connections (faucet), sending data to a 
+listening on a port for connections (faucet), sending data to a
 remote port (hose), or even multiplex multiple streams over a single
 TCP connection (encapsulate).
diff --git a/net/netpipes/pkg/PLIST b/net/netpipes/pkg/PLIST
index 2ef7bf2a5ca..984b057d693 100644
--- a/net/netpipes/pkg/PLIST
+++ b/net/netpipes/pkg/PLIST
@@ -1,10 +1,10 @@
-bin/encapsulate
-bin/faucet
-bin/getpeername
+@bin bin/encapsulate
+@bin bin/faucet
+@bin bin/getpeername
 bin/getsockname
-bin/hose
-bin/sockdown
-bin/timelimit
+@bin bin/hose
+@bin bin/sockdown
+@bin bin/timelimit
 @man man/man1/encapsulate.1
 @man man/man1/faucet.1
 @man man/man1/getpeername.1