diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile
index 254b5901b360..12d8a7f8eb97 100644
--- a/net/ndisc6/Makefile
+++ b/net/ndisc6/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	ndisc6
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.remlab.net/files/ndisc6/ \
 		http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IPv6 network diagnostic tools
 
 LICENSE=	GPLv2
 
 USES=		compiler:c11 perl5 tar:bzip2
 USE_RC_SUBR=	rdnssd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-suid-install \
 		--localstatedir="${PREFIX}/var"
 CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl
 MAKE_ENV=	CHOWNPROG=:
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LDFLAGS=		-lintl
 
 PORTDOCS=	AUTHORS NEWS README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo
index eac1eb80fd07..f99618a9a7ae 100644
--- a/net/ndisc6/distinfo
+++ b/net/ndisc6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635021302
-SHA256 (ndisc6-1.0.5.tar.bz2) = 36932f9fc47e2844abcda7550fa1343b3af4b4208dfb61e0c9d9224aad5df351
-SIZE (ndisc6-1.0.5.tar.bz2) = 267126
+TIMESTAMP = 1659123293
+SHA256 (ndisc6-1.0.6.tar.bz2) = a713210e9be1f15cfa0809f4c2728b00cd5f25881d7585126986982055453cfb
+SIZE (ndisc6-1.0.6.tar.bz2) = 262008
diff --git a/net/ndisc6/files/patch-configure b/net/ndisc6/files/patch-configure
index 2cf476f1e32a..3d764dc4d201 100644
--- a/net/ndisc6/files/patch-configure
+++ b/net/ndisc6/files/patch-configure
@@ -1,38 +1,38 @@
---- configure.orig	2019-01-06 14:36:38 UTC
+--- configure.orig	2022-07-11 16:50:06 UTC
 +++ configure
-@@ -5900,7 +5900,7 @@ fi
+@@ -6355,7 +6355,7 @@ fi
                  if test "X$additional_includedir" = "X/usr/local/include"; then
                    if test -n "$GCC"; then
                      case $host_os in
 -                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 +                      linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;;
                      esac
                    fi
                  fi
-@@ -5946,7 +5946,7 @@ fi
+@@ -6401,7 +6401,7 @@ fi
                           || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                          if test -n "$GCC"; then
                            case $host_os in
 -                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 +                            linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;;
                            esac
                          fi
                        fi
-@@ -6784,7 +6784,7 @@ fi
+@@ -7252,7 +7252,7 @@ fi
                  if test "X$additional_includedir" = "X/usr/local/include"; then
                    if test -n "$GCC"; then
                      case $host_os in
 -                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 +                      linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;;
                      esac
                    fi
                  fi
-@@ -6830,7 +6830,7 @@ fi
+@@ -7298,7 +7298,7 @@ fi
                           || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
                          if test -n "$GCC"; then
                            case $host_os in
 -                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 +                            linux* | gnu* | k*bsd*-gnu | freebsd* ) haveit=yes;;
                            esac
                          fi
                        fi
diff --git a/net/ndisc6/files/patch-rdnss_merge-hook.in b/net/ndisc6/files/patch-rdnss_merge-hook.in
index 03c296e38be7..a9b6c0e9608f 100644
--- a/net/ndisc6/files/patch-rdnss_merge-hook.in
+++ b/net/ndisc6/files/patch-rdnss_merge-hook.in
@@ -1,28 +1,11 @@
---- rdnss/merge-hook.in.orig	2014-12-14 10:13:57 UTC
+--- rdnss/merge-hook.in.orig	2022-01-27 20:23:33 UTC
 +++ rdnss/merge-hook.in
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ set -e
  
  set -e
  
 -PATH=/sbin:/bin
 +PATH=/sbin:/bin:/usr/bin
  
  # Max number of nameserver options taken into account. Should be as
  # defined in <resolv.h>
-@@ -31,14 +31,14 @@ MAXNS=3
- # will limit the IPv6 entries it adds to $RDNSS_LIMIT only.
- RDNSS_LIMIT=$(($MAXNS - 1))
- 
--sysconfdir='@SYSCONFDIR@'
-+sysconfdir='/etc'
- localstatedir='@LOCALSTATEDIR@'
- resolvconf="$sysconfdir/resolv.conf"
- myresolvconf="$localstatedir/run/rdnssd/resolv.conf"
- 
- # These should be POSIX-compliant BREs
- RE_NSV4='^nameserver  *\([0-9]\{1,3\}\.\)\{3,3\}[0-9]\{1,3\} *$'
--RE_NSV4OR6='^nameserver  *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{,1\} *$'
-+RE_NSV4OR6='^nameserver  *[a-fA-F0-9:\.]\{1,46\}\(%[a-zA-Z0-9]\{1,\}\)\{0,1\} *$'
- 
- # Count how many IPv6 nameservers we can fit
-