diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index 85692597024f..23b5a566ca31 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	netpipes
 PORTVERSION=	4.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/kris
 DISTNAME=	netpipes-4.2-export
 
 MAINTAINER=	doconnor@gsoft.com.au
 COMMENT=	Group of shell utilities to connect programs to sockets
 
 CONFLICTS=	timelimit
 
 NO_WRKSUBDIR=	yes
 
 do-install:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} STAGEDIR=${STAGEDIR} install
 
 .include <bsd.port.mk>
diff --git a/net/netpipes/files/patch-Makefile b/net/netpipes/files/patch-Makefile
index 97b8b6147e1e..045c41f34ced 100644
--- a/net/netpipes/files/patch-Makefile
+++ b/net/netpipes/files/patch-Makefile
@@ -1,67 +1,71 @@
---- Makefile.orig	1998-10-29 07:00:03.000000000 +1030
-+++ Makefile	2014-05-11 13:28:21.742500328 +0930
-@@ -17,7 +17,7 @@
+--- Makefile.orig	1998-10-28 20:30:03 UTC
++++ Makefile
+@@ -17,10 +17,10 @@
  
  # You probably want to change this:
  #INSTROOT = ${HOME}
 -INSTROOT = /depot/collections0/netpipes4.1
 +INSTROOT = ${STAGEDIR}/${PREFIX}
  #INSTROOT = /usr/local
  INSTBIN = ${INSTROOT}/bin
- INSTMAN = ${INSTROOT}/man
-@@ -59,7 +59,7 @@
+-INSTMAN = ${INSTROOT}/man
++INSTMAN = ${INSTROOT}/share/man
+ 
+ # For those who wish to use gcc instead of the vendor's compiler.
+ #CC=gcc -Wall
+@@ -59,7 +59,7 @@ INSTMAN = ${INSTROOT}/man
  #CFLAGS = -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
  
  # Linux (developed with RedHat 4.2, libc5)
 -CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
 +#CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CDEBUGFLAGS)
  
  # SGI
  #CFLAGS = -DSYSV $(CDEBUGFLAGS)
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CD
  #CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
  
  # FreeBSD
 -#CFLAGS = -DPOSIX_SIG $(CDEBUGFLAGS)
 +CFLAGS += -DPOSIX_SIG $(CDEBUGFLAGS)
  
  # AIX 4.1.4 and 3.2.5
  #CFLAGS = -DPOSIX_SIG -DAIX $(CDEBUGFLAGS)
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ CFLAGS = -DUSE_IOCTL -DPOSIX_SIG -DHAVE_INET_ATON $(CD
  
  # gcc can handle both -O and -g at once
  #CDEBUGFLAGS = -g # -Wall -DDEBUG
 -CDEBUGFLAGS = -O
 +#CDEBUGFLAGS = -O
  
  ######################################################################
  
-@@ -104,8 +104,7 @@
+@@ -104,8 +104,7 @@ MANPAGES = netpipes.1 faucet.1 hose.1 \
  SSLLIB = -L../SSLeay-0.8.1 -lssl -lcrypto
  
  MANPAGES = netpipes.1 faucet.1 hose.1 \
 -	sockdown.1 getpeername.1 timelimit.1 encapsulate.1 \
 -	ssl-auth.1
 +	sockdown.1 getpeername.1 timelimit.1 encapsulate.1
  PROGRAMS = faucet hose sockdown getpeername timelimit encapsulate
  
  all	: ${PROGRAMS}
-@@ -138,15 +137,9 @@
+@@ -138,15 +137,9 @@ install : all
  	${CC} ${CFLAGS} ${SSLINC} -c $<
  
  install : all
 -	test -d ${INSTROOT}  || mkdir ${INSTROOT}
 -	test -d ${INSTBIN}  || mkdir ${INSTBIN}
 -	cp ${PROGRAMS} ${INSTBIN}/
 -	- rm -f ${INSTBIN}/getsockname
 -	ln -s getpeername ${INSTBIN}/getsockname
 -	- [ -x ssl-auth ] && cp ssl-auth ${INSTBIN}/
 -	test -d ${INSTMAN}  || mkdir ${INSTMAN}
 -	test -d ${INSTMAN}/man1  || mkdir ${INSTMAN}/man1
 -	cp ${MANPAGES} ${INSTMAN}/man1/
 +	${BSD_INSTALL_MAN} ${MANPAGES} ${INSTMAN}/man1/
 +	${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${INSTBIN}/
 +	ln -f -s getpeername ${INSTBIN}/getsockname
  
  #
  
diff --git a/net/netpipes/pkg-plist b/net/netpipes/pkg-plist
index aa631b88e75c..451e38b6a0d4 100644
--- a/net/netpipes/pkg-plist
+++ b/net/netpipes/pkg-plist
@@ -1,14 +1,14 @@
 bin/encapsulate
 bin/faucet
 bin/getpeername
 bin/getsockname
 bin/hose
 bin/sockdown
 bin/timelimit
-man/man1/encapsulate.1.gz
-man/man1/faucet.1.gz
-man/man1/getpeername.1.gz
-man/man1/hose.1.gz
-man/man1/netpipes.1.gz
-man/man1/sockdown.1.gz
-man/man1/timelimit.1.gz
+share/man/man1/encapsulate.1.gz
+share/man/man1/faucet.1.gz
+share/man/man1/getpeername.1.gz
+share/man/man1/hose.1.gz
+share/man/man1/netpipes.1.gz
+share/man/man1/sockdown.1.gz
+share/man/man1/timelimit.1.gz