diff --git a/net/Makefile b/net/Makefile
index 995a51e452ad..6c23c3fb2ab3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -316,6 +316,7 @@
     SUBDIR += nc6
     SUBDIR += ncp
     SUBDIR += ncplib
+    SUBDIR += ndisc6
     SUBDIR += nemesis
     SUBDIR += nepenthes
     SUBDIR += nepim
diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile
new file mode 100644
index 000000000000..2fa9b4f6f594
--- /dev/null
+++ b/net/ndisc6/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	ndisc6
+# Date created:		12 July 2006
+# Whom:			rdenis@simphalempin.com
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ndisc6
+PORTVERSION=	0.6.6
+CATEGORIES=	net ipv6
+MASTER_SITES=	http://www.remlab.net/files/ndisc6/archive/
+
+MAINTAINER=	rdenis@simphalempin.com
+COMMENT=	IPv6 network diagnostic tools
+
+USE_BZIP2=	yes
+USE_GETOPT_LONG=yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-suid-install --mandir=${MANPREFIX}/man
+
+MAN1=		tcpspray6.1
+MAN8=		ndisc6.8 rdisc6.8 rltraceroute6.8
+MLINKS=		tcptraceroute6.8 rltraceroute6.8 \
+		tracert6.8 rltraceroute6.8
+
+PORTDOCS=	AUTHORS NEWS README
+
+post-install:
+.ifndef(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo
new file mode 100644
index 000000000000..24e4e452ed30
--- /dev/null
+++ b/net/ndisc6/distinfo
@@ -0,0 +1,3 @@
+MD5 (ndisc6-0.6.6.tar.bz2) = c0708260bba1f5156aabf9a0f69699e1
+SHA256 (ndisc6-0.6.6.tar.bz2) = 53a06e6177ce47a74a529090b8440714acd8c533d01724ef8c591b358565f0a4
+SIZE (ndisc6-0.6.6.tar.bz2) = 97395
diff --git a/net/ndisc6/files/patch-src_tcpspray.c b/net/ndisc6/files/patch-src_tcpspray.c
new file mode 100644
index 000000000000..c0e13130cc9d
--- /dev/null
+++ b/net/ndisc6/files/patch-src_tcpspray.c
@@ -0,0 +1,13 @@
+--- src/tcpspray.c.orig	Wed Jul 12 19:01:50 2006
++++ src/tcpspray.c	Sat Aug  5 16:31:01 2006
+@@ -48,6 +48,10 @@
+ # include <getopt.h>
+ #endif
+ 
++#ifndef SIZE_MAX
++#  define SIZE_MAX SIZE_T_MAX
++#endif
++
+ static int family = 0;
+ static unsigned verbose = 0;
+ 
diff --git a/net/ndisc6/pkg-descr b/net/ndisc6/pkg-descr
new file mode 100644
index 000000000000..12f7bb095641
--- /dev/null
+++ b/net/ndisc6/pkg-descr
@@ -0,0 +1,6 @@
+ndisc6 is a collection of diagnostic tools for IPv6 networks,
+including ICMPv6 Neighbor Discovery tools (rdisc6 and ndisc6),
+an UDP, TCP and ICMP-based IPv6 traceroute implementation and
+a simplistic bandwidth measurement program (tcpspray6).
+
+WWW: http://www.simphalempin.com/dev/ndisc6/
diff --git a/net/ndisc6/pkg-plist b/net/ndisc6/pkg-plist
new file mode 100644
index 000000000000..8ecae6b48da6
--- /dev/null
+++ b/net/ndisc6/pkg-plist
@@ -0,0 +1,6 @@
+bin/tcpspray6
+sbin/ndisc6
+sbin/rdisc6
+sbin/tcptraceroute6
+sbin/rltraceroute6
+sbin/tracert6