diff --git a/net/fping/Makefile b/net/fping/Makefile
index 9767a2f3abf..2aa28afe843 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2007/09/04 10:32:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2008/10/28 23:49:58 sthen Exp $
 # $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $
 
 COMMENT=		quickly ping N hosts w/o flooding the network
 
 VERSION=		2.4b2
 DISTNAME=		fping-${VERSION}_to-ipv6
-PKGNAME=		fping-${VERSION}p3
+PKGNAME=		fping-${VERSION}p4
 CATEGORIES=		net
 MASTER_SITES=		http://fping.sourceforge.net/download/
 HOMEPAGE=		http://www.fping.com/
@@ -22,9 +22,17 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--bindir=${PREFIX}/sbin
 COPTS+=			-DHAVE_PROGNAME
 
+post-build:
+	cd ${WRKSRC}; \
+	    ${CC} -DHAVE_CONFIG_H -I. -I. -I. ${CFLAGS} \
+		-DHAVE_PROGNAME -c fping.c -DIPV6 -o fping6.o; \
+	    ${CC} ${CFLAGS} -DHAVE_PROGNAME -o fping6 fping6.o
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/fping ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/fping6 ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKBUILD}/fping.8 ${PREFIX}/man/man8
+	ln ${PREFIX}/man/man8/fping.8 ${PREFIX}/man/man8/fping6.8
 	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/fping
 	${INSTALL_MAN} ${WRKBUILD}/COPYING ${PREFIX}/share/doc/fping
 	${INSTALL_MAN} ${WRKBUILD}/README ${PREFIX}/share/doc/fping
diff --git a/net/fping/patches/patch-fping_8 b/net/fping/patches/patch-fping_8
index 652ddf6374a..297718ddcc0 100644
--- a/net/fping/patches/patch-fping_8
+++ b/net/fping/patches/patch-fping_8
@@ -1,7 +1,7 @@
-$OpenBSD: patch-fping_8,v 1.2 2006/10/12 08:22:37 jakob Exp $
---- fping.8.orig	Mon Jun 19 21:55:08 2006
-+++ fping.8	Mon Jun 19 21:55:32 2006
-@@ -152,12 +152,12 @@ Sure the open2 usage is not needed in th
+$OpenBSD: patch-fping_8,v 1.3 2008/10/28 23:49:58 sthen Exp $
+--- fping.8.orig	Mon Jan 21 02:05:48 2002
++++ fping.8	Tue Oct 28 01:37:46 2008
+@@ -152,12 +152,12 @@ Sure the open2 usage is not needed in this example, bu
  example none the less. 
  .nf
  
@@ -16,7 +16,7 @@ $OpenBSD: patch-fping_8,v 1.2 2006/10/12 08:22:37 jakob Exp $
  
  @check=("slapshot","foo","foobar");
  
-@@ -178,7 +178,7 @@ Another good example is when you want to
+@@ -178,7 +178,7 @@ Another good example is when you want to perform an ac
  that are currently reachable.
  .nf
  
diff --git a/net/fping/pkg/PLIST b/net/fping/pkg/PLIST
index d5677d401b1..dc376725e5b 100644
--- a/net/fping/pkg/PLIST
+++ b/net/fping/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:40 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2008/10/28 23:49:58 sthen Exp $
 @man man/man8/fping.8
-sbin/fping
+@man man/man8/fping6.8
+@bin sbin/fping
+@bin sbin/fping6
 share/doc/fping/
 share/doc/fping/COPYING
 share/doc/fping/README