diff --git a/net-mgmt/ipv6calc/Makefile b/net-mgmt/ipv6calc/Makefile
index 6fec55b36870..99b74a27c87a 100644
--- a/net-mgmt/ipv6calc/Makefile
+++ b/net-mgmt/ipv6calc/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	ipv6calc
-PORTVERSION=	3.2.0
+PORTVERSION=	4.0.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/
+MASTER_SITES=	https://www.bieringer.de/ftp/pub/linux/IPv6/ipv6calc/ \
+		https://www.deepspace6.net/ftp/pub/ds6/sources/ipv6calc/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Convert, change, and calculate with IPv6 addresses
-WWW=		https://www.deepspace6.net/projects/ipv6calc.html
+WWW=		https://www.deepspace6.net/projects/ipv6calc.html \
+		https://github.com/pbiering/ipv6calc
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash>0:shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		gmake perl5 shebangfix ssl
 
 GNU_CONFIGURE=	yes
 
-SHEBANG_FILES=	tools/*.pl tools/*.sh.in
-
-CFLAGS+=	-Wno-unknown-warning-option
+SHEBANG_FILES=	tools/*
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ipv6calc/distinfo b/net-mgmt/ipv6calc/distinfo
index 5c5b9a01f631..7245090bb2bb 100644
--- a/net-mgmt/ipv6calc/distinfo
+++ b/net-mgmt/ipv6calc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626616062
-SHA256 (ipv6calc-3.2.0.tar.gz) = c73e1488a344d5ce3acdd009fb48068eec1bdf7562698011bdbbc7aaf33aa8f7
-SIZE (ipv6calc-3.2.0.tar.gz) = 1645414
+TIMESTAMP = 1663672750
+SHA256 (ipv6calc-4.0.1.tar.gz) = 0de7dbe66c0e3602becc18bb8f69a278a02eeaf5d58779cd1c0e0069eb80a7e6
+SIZE (ipv6calc-4.0.1.tar.gz) = 1705407
diff --git a/net-mgmt/ipv6calc/pkg-descr b/net-mgmt/ipv6calc/pkg-descr
index 579e20c854c7..b764d6652730 100644
--- a/net-mgmt/ipv6calc/pkg-descr
+++ b/net-mgmt/ipv6calc/pkg-descr
@@ -1,5 +1,6 @@
-ipv6calc will do some format changes and calculations for you
-
-Intention:
-* This utility can be used by the IPv6 enabled initscripts for
-  better duplicate address detection on setup of IPv6 addresses.
+ipv6calc is a small utility written in programming language C to manipulate (not
+only) IPv6 addresses and is able to do other tricky things. Intentions were
+convering a given IPv6 address into compressed format, convering a given IPv6
+address into the same format like shown in /proc/net/if_inet6 and (because it
+was not difficulty) migrating the Perl program ip6_int into. Now only one
+utiltity is needed to do a lot.
diff --git a/net-mgmt/ipv6calc/pkg-plist b/net-mgmt/ipv6calc/pkg-plist
index 6cdb82e287d8..44e2c3b4a0f2 100644
--- a/net-mgmt/ipv6calc/pkg-plist
+++ b/net-mgmt/ipv6calc/pkg-plist
@@ -11,6 +11,7 @@ man/man8/ipv6logstats.8.gz
 %%DATADIR%%/tools/IP2Location-update.sh
 %%DATADIR%%/tools/ipv6calc-create-registry-list-ipv4.pl
 %%DATADIR%%/tools/ipv6calc-create-registry-list-ipv6.pl
+%%DATADIR%%/tools/ipv6calc-create-update-ipset.sh
 %%DATADIR%%/tools/ipv6calc-db-update.sh
 %%DATADIR%%/tools/ipv6calc-registries-check-run-create.sh
 %%DATADIR%%/tools/ipv6calc-update-registries.sh