diff --git a/net/Makefile b/net/Makefile
index 80b7ee15bc85..aa7ba49b879c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -675,6 +675,7 @@
     SUBDIR += service-discovery-applet
     SUBDIR += sflowtool
     SUBDIR += sharity-light
+    SUBDIR += shelldap
     SUBDIR += shmux
     SUBDIR += silc-client
     SUBDIR += silc-server
diff --git a/net/shelldap/Makefile b/net/shelldap/Makefile
new file mode 100644
index 000000000000..31d593694534
--- /dev/null
+++ b/net/shelldap/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	shelldap
+# Date created:		2006-07-07
+# Whom:			Mahlon E. Smith <mahlon@martini.nu>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	shelldap
+PORTVERSION=	0.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.martini.nu/misc/
+
+MAINTAINER=	mahlon@martini.nu
+COMMENT=	A shell-like environment for LDAP
+
+RUN_DEPENDS=	\
+	${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff \
+	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
+	${SITE_PERL}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+	${SITE_PERL}/Term/Shell.pm:${PORTSDIR}/devel/p5-Term-Shell \
+	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
+	${SITE_PERL}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+	${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck
+
+USE_PERL5=	yes
+
+MAN1=		shelldap.1
+
+PLIST_FILES=	bin/shelldap
+
+NO_BUILD=	yes
+
+post-extract:
+	${MKDIR} ${WRKSRC}/man/man1
+	${LOCALBASE}/bin/pod2man < ${WRKSRC}/shelldap > ${WRKSRC}/man/man1/shelldap.1
+
+do-install:
+	${INSTALL_MAN} ${WRKSRC}/man/man1/shelldap.1 ${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/shelldap ${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/net/shelldap/distinfo b/net/shelldap/distinfo
new file mode 100644
index 000000000000..1fcb09291cc2
--- /dev/null
+++ b/net/shelldap/distinfo
@@ -0,0 +1,3 @@
+MD5 (shelldap-0.1.tar.gz) = a283288b657ca0a307f12031c9e97371
+SHA256 (shelldap-0.1.tar.gz) = 41344c5a474124a0ddbff1b2086ec3a0d15b4fcc475db993c4ad71782ae3cc7a
+SIZE (shelldap-0.1.tar.gz) = 12179
diff --git a/net/shelldap/pkg-descr b/net/shelldap/pkg-descr
new file mode 100644
index 000000000000..278df234a628
--- /dev/null
+++ b/net/shelldap/pkg-descr
@@ -0,0 +1,15 @@
+This is shelldap, a handy shell-like interface for browsing
+LDAP servers and editing their content.
+
+Among its features:
+
+	- history
+	- sane autocompletes
+	- credential caching
+	- site-wide and individual config
+	- it's in perl
+	- it's fun to say!  shelldap! shelldap! shelldap!
+
+For more info, 'perldoc' the script.
+
+Author:	Mahlon E. Smith <mahlon@martini.nu>