diff --git a/sysutils/Makefile b/sysutils/Makefile
index 293d4878e037..938af8355859 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -14,6 +14,7 @@
     SUBDIR += afbinit
     SUBDIR += afio
     SUBDIR += ah-tty
+    SUBDIR += am-utils
     SUBDIR += anacron
     SUBDIR += and
     SUBDIR += anteater
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
new file mode 100644
index 000000000000..57ceba643003
--- /dev/null
+++ b/sysutils/am-utils/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:   oneko
+# Date created:        5 December 1994
+# Whom:                asami
+#
+# $FreeBSD$
+#
+
+PORTNAME=	am-utils
+PORTVERSION=	6.1.b4
+CATEGORIES=	sysutils net
+MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/b/}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	The Berkeley Automounter Suite of Utilities
+
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL_VER=15
+
+.if defined(WITH_OPENLDAP)
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=	--with-ldap=yes --enable-ldflags=-L${LOCALBASE}/lib --enable-cppflags=-I${LOCALBASE}/include
+.endif
+
+INFO=		am-utils
+MAN1=		expn.1 pawd.1
+MAN5=		amd.conf.5
+MAN8=		amd.8 amq.8 automount2amd.8 fixmount.8 fsinfo.8 hlfsd.8 mk-amd-map.8 wire-test.8
+
+.include <bsd.port.mk>
diff --git a/sysutils/am-utils/distinfo b/sysutils/am-utils/distinfo
new file mode 100644
index 000000000000..3efb1ebb447d
--- /dev/null
+++ b/sysutils/am-utils/distinfo
@@ -0,0 +1,2 @@
+MD5 (am-utils-6.1b4.tar.gz) = 5955478616c2c2b8e8c4bf455b37644d
+SIZE (am-utils-6.1b4.tar.gz) = 1634813
diff --git a/sysutils/am-utils/pkg-descr b/sysutils/am-utils/pkg-descr
new file mode 100644
index 000000000000..ee5b67d63a88
--- /dev/null
+++ b/sysutils/am-utils/pkg-descr
@@ -0,0 +1,15 @@
+This is a port of am-utils, The Berkeley Automounter Suite of Utilities
+
+The Berkeley Automounter, Amd, may be used as a replacement for Sun's
+automounter.
+
+An automounter maintains a cache of mounted file systems. File systems
+are mounted on demand when they are first referenced, and unmounted
+after a period of inactivity. This helps to centralize all file system
+access, provide a uniform site-wide namespace, and minimize downtimes
+for clients.
+
+WWW: http://www.am-utils.org/
+
+- Jon Wilson
+jon@phuq.co.uk
diff --git a/sysutils/am-utils/pkg-plist b/sysutils/am-utils/pkg-plist
new file mode 100644
index 000000000000..0c1a26b9942d
--- /dev/null
+++ b/sysutils/am-utils/pkg-plist
@@ -0,0 +1,25 @@
+bin/expn
+bin/pawd
+etc/amd.conf-sample
+etc/lostaltmail.conf-sample
+lib/libamu.a
+lib/libamu.so
+lib/libamu.so.3
+sbin/am-eject
+sbin/amd
+sbin/amd2ldif
+sbin/amd2sun
+sbin/amq
+sbin/automount2amd
+sbin/ctl-amd
+sbin/ctl-hlfsd
+sbin/fix-amd-map
+sbin/fixmount
+sbin/fixrmtab
+sbin/fsinfo
+sbin/hlfsd
+sbin/lostaltmail
+sbin/mk-amd-map
+sbin/wait4amd
+sbin/wait4amd2die
+sbin/wire-test