diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile
index 5dccf590ee4e..a58c37b6c223 100644
--- a/lib/libpam/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -1,39 +1,36 @@
 .include <src.opts.mk>
 
 PACKAGE=	runtime
 
 NO_OBJ=
 
 CONFGROUPS=	CONFS
 CONFS=	README \
 	imap \
 	login \
 	other \
 	passwd pop3 \
 	sshd su system \
 	xdm
 
 CONFDIR=	/etc/pam.d
 CONFSMODE_README=	444
 
 CONFGROUPS+=	CRON
 CRON+=		cron
 CRONPACKAGE=	cron
 
 .if ${MK_AT} != "no"
 CONFGROUPS+=	AT
-AT+=	atrun
+AT+=		atrun
 ATPACKAGE+=	at
 .endif
 
 .if ${MK_FTP} != "no"
 CONFGROUPS+=	FTP
-FTP+=	ftpd
-FTPPACKAGE=	ftp
-
-LINKMODE=	${CONFMODE}
-afterinstallconfig:
-	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp
+FTP+=		ftp ftpd
+# Do not put these in the ftp package, since ports also use them.
+FTPPACKAGE=	runtime
 .endif
 
 .include <bsd.prog.mk>
diff --git a/lib/libpam/pam.d/ftp b/lib/libpam/pam.d/ftp
new file mode 100644
index 000000000000..1c255441dca6
--- /dev/null
+++ b/lib/libpam/pam.d/ftp
@@ -0,0 +1,13 @@
+#
+# PAM configuration for the "ftp" service.  This is not used by the FreeBSD
+# ftpd(8), but is provided for compatibility with FTP servers from ports.
+#
+
+# auth
+auth		include		ftpd
+
+# account
+account		include		ftpd
+
+# session
+session		include		ftpd