diff --git a/net/Makefile b/net/Makefile
index 3adecefc0bcd..e480fb0ef7a0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -401,6 +401,7 @@
     SUBDIR += nettest
     SUBDIR += netwib
     SUBDIR += newsbot
+    SUBDIR += nfsshell
     SUBDIR += ng_daphne
     SUBDIR += ng_netflow
     SUBDIR += ngrep
diff --git a/net/nfsshell/Makefile b/net/nfsshell/Makefile
new file mode 100644
index 000000000000..14949c081c4c
--- /dev/null
+++ b/net/nfsshell/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	nfsshell
+# Date created:				5 February 2005
+# Whom:					johans@stack.nl
+#
+# $FreeBSD$
+#
+
+PORTNAME=	nfsshell
+PORTVERSION=	19980519
+CATEGORIES=	net
+MASTER_SITES=	http://www.cs.vu.nl/pub/leendert/
+DISTNAME=	${PORTNAME}
+
+MAINTAINER=	johans@stack.nl
+COMMENT=	Userland NFS command tool
+
+WRKSRC=		${WRKDIR}/nfs
+ALL_TARGET=	nfs
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DREADLINE" LIBS="-lreadline"
+
+PLIST_FILES=	bin/nfsshell
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/nfs ${PREFIX}/bin/nfsshell
+
+.include <bsd.port.mk>
diff --git a/net/nfsshell/distinfo b/net/nfsshell/distinfo
new file mode 100644
index 000000000000..e38dc8963c28
--- /dev/null
+++ b/net/nfsshell/distinfo
@@ -0,0 +1,2 @@
+MD5 (nfsshell.tar.gz) = d447235518691fc3176ce89a6d836ce7
+SIZE (nfsshell.tar.gz) = 29213
diff --git a/net/nfsshell/files/patch-nfs.c b/net/nfsshell/files/patch-nfs.c
new file mode 100644
index 000000000000..148e8cc399ef
--- /dev/null
+++ b/net/nfsshell/files/patch-nfs.c
@@ -0,0 +1,10 @@
+--- nfs.c.orig	Sat Feb  5 23:17:18 2005
++++ nfs.c	Sat Feb  5 23:17:09 2005
+@@ -50,7 +50,6 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/time.h>
+-#include <sys/sysmacros.h>
+ #include "mount.h"
+ #include "nfs_prot.h"
+ #include <netinet/in_systm.h>
diff --git a/net/nfsshell/pkg-descr b/net/nfsshell/pkg-descr
new file mode 100644
index 000000000000..18a7d11fca87
--- /dev/null
+++ b/net/nfsshell/pkg-descr
@@ -0,0 +1,4 @@
+nfs shell provides user level access to an NFS server, over UDP or TCP,
+supports source routing and "secure" (privileged port) mounts. It's a
+useful tool to manually check (or show) security problems after a security
+scanner has detected them.