diff --git a/sysutils/modules/Makefile b/sysutils/modules/Makefile
index 86c819fd2c61..9f8a90fd69d6 100644
--- a/sysutils/modules/Makefile
+++ b/sysutils/modules/Makefile
@@ -1,38 +1,42 @@
 PORTNAME=	modules
 DISTVERSION=	5.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils tcl
 MASTER_SITES=	https://github.com/envmodules/modules/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	laurent@FreeBSD.org
 COMMENT=	Dynamic modification of a user environment
 WWW=		https://modules.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
 		bash:shells/bash
 TEST_DEPENDS=	runtest:misc/dejagnu
 
 USES=		gmake python:env shebangfix tar:bzip2 tcl
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/Modules
 CONFIGURE_ARGS=	--enable-versioning \
+		--with-modulepath=${GNU_CONFIGURE_PREFIX}/\$$MODULE_VERSION/modulefiles:${PREFIX}/etc/modulefiles \
 		--with-python="${PYTHON_CMD}"
 
 TEST_TARGET=	test
 
+SUB_FILES=	pkg-message
 PLIST_SUB=	MODULES_VERSION=${DISTVERSION}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${GNU_CONFIGURE_PREFIX}/${DISTVERSION}/lib/libtclenvmodules.so
 
 post-stage:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/profile.d
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/modulefiles \
+		${STAGEDIR}${PREFIX}/etc/profile.d
 	${RLN} ${STAGEDIR}${PREFIX}/Modules/${PORTVERSION}/init/profile.sh \
 		${STAGEDIR}${PREFIX}/etc/profile.d/module.sh
 	${RLN} ${STAGEDIR}${PREFIX}/Modules/${PORTVERSION}/init/profile.csh \
 		${STAGEDIR}${PREFIX}/etc/profile.d/module.csh
 
 .include <bsd.port.mk>
diff --git a/sysutils/modules/files/pkg-message.in b/sysutils/modules/files/pkg-message.in
new file mode 100644
index 000000000000..5f11355271b6
--- /dev/null
+++ b/sysutils/modules/files/pkg-message.in
@@ -0,0 +1,16 @@
+[
+{
+	message: <<EOD
+To enable modules for bash(1), ksh(1), or zsh(1):
+
+  . %%PREFIX%%/etc/profile.d/module.sh
+
+For csh(1) or tcsh(1):
+
+  source %%PREFIX%%/etc/profile.d/module.csh
+
+This step is not needed for sh(1).
+EOD,
+	type: install
+}
+]
diff --git a/sysutils/modules/pkg-plist b/sysutils/modules/pkg-plist
index c083be6ac8f6..92ff741d1949 100644
--- a/sysutils/modules/pkg-plist
+++ b/sysutils/modules/pkg-plist
@@ -1,64 +1,65 @@
 Modules/%%MODULES_VERSION%%/bin/add.modules
 Modules/%%MODULES_VERSION%%/bin/envml
 Modules/%%MODULES_VERSION%%/bin/mkroot
 Modules/%%MODULES_VERSION%%/bin/modulecmd
 Modules/%%MODULES_VERSION%%/etc/initrc
 Modules/%%MODULES_VERSION%%/etc/siteconfig.tcl
 Modules/%%MODULES_VERSION%%/init/bash
 Modules/%%MODULES_VERSION%%/init/bash_completion
 Modules/%%MODULES_VERSION%%/init/cmake
 Modules/%%MODULES_VERSION%%/init/csh
 Modules/%%MODULES_VERSION%%/init/fish
 Modules/%%MODULES_VERSION%%/init/fish_completion
 Modules/%%MODULES_VERSION%%/init/ksh
 Modules/%%MODULES_VERSION%%/init/ksh-functions/ml
 Modules/%%MODULES_VERSION%%/init/ksh-functions/module
 Modules/%%MODULES_VERSION%%/init/lisp
 Modules/%%MODULES_VERSION%%/init/perl.pm
 Modules/%%MODULES_VERSION%%/init/profile.csh
 Modules/%%MODULES_VERSION%%/init/profile.sh
 Modules/%%MODULES_VERSION%%/init/pwsh.ps1
 Modules/%%MODULES_VERSION%%/init/python.py
 Modules/%%MODULES_VERSION%%/init/r.R
 Modules/%%MODULES_VERSION%%/init/ruby.rb
 Modules/%%MODULES_VERSION%%/init/sh
 Modules/%%MODULES_VERSION%%/init/tcl
 Modules/%%MODULES_VERSION%%/init/tcsh
 Modules/%%MODULES_VERSION%%/init/tcsh_completion
 Modules/%%MODULES_VERSION%%/init/zsh
 Modules/%%MODULES_VERSION%%/init/zsh-functions/_module
 Modules/%%MODULES_VERSION%%/lib/libtclenvmodules.so
 Modules/%%MODULES_VERSION%%/libexec/modulecmd.tcl
 Modules/%%MODULES_VERSION%%/modulefiles/dot
 Modules/%%MODULES_VERSION%%/modulefiles/module-git
 Modules/%%MODULES_VERSION%%/modulefiles/module-info
 Modules/%%MODULES_VERSION%%/modulefiles/modules
 Modules/%%MODULES_VERSION%%/modulefiles/null
 Modules/%%MODULES_VERSION%%/modulefiles/use.own
 Modules/%%MODULES_VERSION%%/share/doc/CONTRIBUTING.txt
 Modules/%%MODULES_VERSION%%/share/doc/COPYING.GPLv2
 Modules/%%MODULES_VERSION%%/share/doc/ChangeLog.gz
 Modules/%%MODULES_VERSION%%/share/doc/INSTALL-win.txt
 Modules/%%MODULES_VERSION%%/share/doc/INSTALL.txt
 Modules/%%MODULES_VERSION%%/share/doc/MIGRATING.txt
 Modules/%%MODULES_VERSION%%/share/doc/NEWS.txt
 Modules/%%MODULES_VERSION%%/share/doc/README
 Modules/%%MODULES_VERSION%%/share/doc/changes.txt
 Modules/%%MODULES_VERSION%%/share/emacs/lisp/modulefile-mode.el
 Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_globalrc.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_modulecache.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_modulefile.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/plugin_modulerc.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/syntaxdb_modulecache.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/syntaxdb_modulefile.tcl
 Modules/%%MODULES_VERSION%%/share/nagelfar/syntaxdb_modulerc.tcl
 Modules/%%MODULES_VERSION%%/share/vim/vimfiles/ftdetect/modulefile.vim
 Modules/%%MODULES_VERSION%%/share/vim/vimfiles/ftplugin/modulefile.vim
 Modules/%%MODULES_VERSION%%/share/vim/vimfiles/syntax/modulefile.vim
 Modules/versions/%%MODULES_VERSION%%
+@dir etc/modulefiles
 etc/profile.d/module.csh
 etc/profile.d/module.sh
 share/man/man1/envml.1.gz
 share/man/man1/ml.1.gz
 share/man/man1/module.1.gz
 share/man/man5/modulefile.5.gz