diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index cca7c5f944f..e320640787e 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2002/02/28 13:34:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2002/05/19 20:02:05 naddy Exp $
 
 COMMENT=	"tool for manipulating IPv6 addresses"
 
-DISTNAME=	ipv6calc-0.37
+DISTNAME=	ipv6calc-0.41
 CATEGORIES=	net
 NEED_VERSION=	1.504
 HOMEPAGE=	http://www.bieringer.de/linux/IPv6/index.html
@@ -24,6 +24,7 @@ CONFIGURE_STYLE= gnu
 MAKE_FLAGS=	CC="${CC}" COPTS="${CFLAGS}"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc ${PREFIX}/bin/ipv6calc
+	${INSTALL_PROGRAM} ${WRKSRC}/ipv6calc/ipv6calc ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipv6logconv/ipv6logconv ${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/net/ipv6calc/distinfo b/net/ipv6calc/distinfo
index dc6c85b509d..5c3301a08dc 100644
--- a/net/ipv6calc/distinfo
+++ b/net/ipv6calc/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipv6calc-0.37.tar.gz) = 6957198e8c0abe6a314638fb285cf5dc
-RMD160 (ipv6calc-0.37.tar.gz) = 49a3ad756ee6c5962790cf676bf6cc341ec6fabb
-SHA1 (ipv6calc-0.37.tar.gz) = 3fc4f473d2c1734aaf58087f2470997c2b6c21de
+MD5 (ipv6calc-0.41.tar.gz) = 9940c38036a81d2423f9a06c8d57cdc1
+RMD160 (ipv6calc-0.41.tar.gz) = b17f62f60e96441eb5c5e5c1ce241e1ce2204bd3
+SHA1 (ipv6calc-0.41.tar.gz) = 73fb8266af6b1636e119fcdfadeaa7599fd9b4ff
diff --git a/net/ipv6calc/patches/patch-getopt_getopt_c b/net/ipv6calc/patches/patch-getopt_getopt_c
new file mode 100644
index 00000000000..d2a1282739f
--- /dev/null
+++ b/net/ipv6calc/patches/patch-getopt_getopt_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-getopt_getopt_c,v 1.1 2002/05/19 20:02:05 naddy Exp $
+--- getopt/getopt.c.orig	Sun May 19 21:41:08 2002
++++ getopt/getopt.c	Sun May 19 21:41:26 2002
+@@ -43,6 +43,7 @@ USA.  */
+ #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 cb676497dd5..456f34e930d 100644
--- a/net/ipv6calc/pkg/PLIST
+++ b/net/ipv6calc/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/02/27 01:35:08 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2002/05/19 20:02:05 naddy Exp $
 bin/ipv6calc
+bin/ipv6logcon