diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index 65ebde209cb..d92d058527b 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/16 00:31:22 alek Exp $
+# $OpenBSD: Makefile,v 1.11 2007/05/28 17:23:05 rui Exp $
 
 COMMENT=	"tool for manipulating IPv6 addresses"
 
-DISTNAME=	ipv6calc-0.46
+DISTNAME=	ipv6calc-0.70.0
 CATEGORIES=	net
 HOMEPAGE=	http://www.deepspace6.net/projects/ipv6calc.html
 
@@ -13,15 +13,15 @@ MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/ \
 		ftp://ftp.nvg.ntnu.no/pub/IPv6/bieringer/ipv6calc/ \
 		ftp://ftp3.linux.it/pub/mirrors/IPv6/bieringer/ipv6calc/
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c crypto
-
-CONFIGURE_STYLE= gnu
+WANTLIB=		c
 
+CONFIGURE_STYLE=gnu
+USE_GMAKE=	Yes
 MAKE_FLAGS=	CC="${CC}" COPTS+="${CFLAGS}"
 
 REGRESS_TARGET=	test
@@ -30,5 +30,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipv6logconv/ipv6logconv ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipv6logstats/ipv6logstats ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipv6loganon/ipv6loganon ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/man/ipv6calc.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/man/ipv6logconv.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/man/ipv6logstats.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/man/ipv6loganon.8 ${PREFIX}/man/man8/
 
 .include <bsd.port.mk>
diff --git a/net/ipv6calc/distinfo b/net/ipv6calc/distinfo
index 4b3f24a5903..bc6dbaf0cfc 100644
--- a/net/ipv6calc/distinfo
+++ b/net/ipv6calc/distinfo
@@ -1,5 +1,5 @@
-MD5 (ipv6calc-0.46.tar.gz) = WqYLinRP5TFkxoMJiYtOjg==
-RMD160 (ipv6calc-0.46.tar.gz) = sLT2iVDxmZF03WX5IjOjnAuTsgE=
-SHA1 (ipv6calc-0.46.tar.gz) = 1NA63amybLypBvz7P6NljCUcztk=
-SHA256 (ipv6calc-0.46.tar.gz) = VJWgpuBUxEDbkSErKjUxYnggEAy3jjE0eOmk3xrxb9Q=
-SIZE (ipv6calc-0.46.tar.gz) = 338497
+MD5 (ipv6calc-0.70.0.tar.gz) = xRmIFWWO40IKFA50QxhzEQ==
+RMD160 (ipv6calc-0.70.0.tar.gz) = ADgVx+GmYY0ii3Eg9IHX/8AZXww=
+SHA1 (ipv6calc-0.70.0.tar.gz) = VLthsi0n87WWfA6U5wMV4c+filg=
+SHA256 (ipv6calc-0.70.0.tar.gz) = /zpZOBuSm09Tnyl9by9TnDQIbfYfuH7iEgLEZpY1V2M=
+SIZE (ipv6calc-0.70.0.tar.gz) = 457648
diff --git a/net/ipv6calc/patches/patch-Makefile_in b/net/ipv6calc/patches/patch-Makefile_in
new file mode 100644
index 00000000000..900d2cf0be9
--- /dev/null
+++ b/net/ipv6calc/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2007/05/28 17:23:05 rui Exp $
+--- Makefile.in.orig	Wed Feb 14 19:53:59 2007
++++ Makefile.in	Tue May 15 22:05:51 2007
+@@ -15,7 +15,7 @@ ifeq (@ENABLE_BUNDLED_GETOPT@, 1)
+   GETOPT_DIR  = getopt
+ endif
+ 
+-CFLAGS = $(COPTS) -I$(GETOPT_DIR)
++CFLAGS = -I.
+ 
+ CC	= gcc
+ 
diff --git a/net/ipv6calc/patches/patch-getopt_getopt_c b/net/ipv6calc/patches/patch-getopt_getopt_c
deleted file mode 100644
index 5b6c21507ce..00000000000
--- a/net/ipv6calc/patches/patch-getopt_getopt_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- getopt/getopt.c.orig	Tue Oct  7 14:31:42 2003
-+++ getopt/getopt.c	Tue Oct  7 14:31:56 2003
-@@ -43,6 +43,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <string.h>
- 
- /* Comment out all this code if we are using the GNU C Library, and are not
-    actually compiling the library itself.  This code is part of the GNU C
diff --git a/net/ipv6calc/pkg/PLIST b/net/ipv6calc/pkg/PLIST
index 3d472c09201..9cdbfe57d65 100644
--- a/net/ipv6calc/pkg/PLIST
+++ b/net/ipv6calc/pkg/PLIST
@@ -1,4 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/10/07 15:58:20 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.5 2007/05/28 17:23:05 rui Exp $
 bin/ipv6calc
+bin/ipv6loganon
 bin/ipv6logconv
 bin/ipv6logstats
+@man man/man8/ipv6calc.8
+@man man/man8/ipv6loganon.8
+@man man/man8/ipv6logconv.8
+@man man/man8/ipv6logstats.8