diff --git a/40-build-modules b/40-build-modules
deleted file mode 100755
index 73ee00d..0000000
--- a/40-build-modules
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-#
-# https://core.tcl-lang.org
-#
-
-set -x
-
-P=modules
-V=${MODULES_VERSION:-3.2.10.1}
-
-FNAME="$P-$V.tar.gz"
-DOWNLOAD_URL="https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
-
-PREFIX="${PMODULES_HOME}"
-SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
-SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
-BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
-
-PATH="${PREFIX}/bin:${PATH}"
-
-trap "pb_exit" EXIT
-
-# download
-test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
-
-# unpack
-mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
-tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
-
-# configure
-mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
-case $(uname -s) in
-	Linux )
-		declare -x LIBS="-lz -lpthread"
-		;;
-	Darwin )
-		declare -x LIBS="-lz -framework CoreFoundation"
-		;;
-	* )
-		echo "Oops: unsupported OS!" 1>&2
-		exit ${PB_ERR_SYSTEM}
-		;;
-esac
-CPPFLAGS="-DUSE_INTERP_ERRORLINE" \
-"${SRC_DIR}"/configure \
-	--prefix="${PREFIX}" \
-	--exec-prefix="${PREFIX}" \
-	--with-module-path="${PREFIX%%/Tools*}/Tools/${PMODULES_MODULEFILES_DIR}" \
-	--with-tcl="${PREFIX}/lib" \
-	--without-x \
-	--disable-versioning \
-        || exit ${PB_ERR_CONFIGURE}
-
-# compile & install
-make -j ${NJOBS} || exit ${PB_ERR_MAKE}
-make install || exit ${PB_ERR_INSTALL}
-
-# post-install
-mkdir -p "${PREFIX}/share/man/man1"
-mkdir -p "${PREFIX}/share/man/man4"
-rm -v   "${PREFIX}/Modules/bin/add.modules"
-rm -v   "${PREFIX}/Modules/bin/mkroot"
-rm -rfv "${PREFIX}/Modules/modulefiles"
-mv -v   "${PREFIX}/Modules/share/man/man1/module.1" "${PREFIX}/share/man/man1"
-mv -v   "${PREFIX}/Modules/share/man/man4/modulefile.4" "${PREFIX}/share/man/man4"
-rmdir   "${PREFIX}/Modules/bin"
-rmdir   "${PREFIX}/Modules/share/man/man1"
-rmdir   "${PREFIX}/Modules/share/man/man4"
-rmdir   "${PREFIX}/Modules/share/man"
-rmdir   "${PREFIX}/Modules/share"
-rmdir   "${PREFIX}/Modules"
-rm -f	"${PREIX}/init/{ksh,perl.pm,python.py,ruby.rb,cmake,.modulespath}"
-cp -v   "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
-
-# Local Variables:
-# mode: sh
-# sh-basic-offset: 8
-# tab-width: 8
-# End:
diff --git a/build b/build
index 12d737b..4c867ab 100755
--- a/build
+++ b/build
@@ -1,107 +1,84 @@
 #!/usr/bin/env bash
 #
-if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
-	echo "BASH version >= 4 is required and must be available in PATH!" 1>&2
+
+declare -rx VERSION='1.1.10'
+
+if (( "${BASH_VERSINFO[0]}" < 5 )); then
+	echo "BASH version 5.0 or newer is required and must be available in PATH!" 1>&2
 	exit 1
 fi
 
-declare	BOOTSTRAP_DIR=$(dirname "$0")
-source "${BOOTSTRAP_DIR}/Pmodules/libstd.bash" || { echo "Oops!" 1>&2; exit 42; }
-source "${BOOTSTRAP_DIR}/Pmodules/libpbuild.bash" || { echo "Oops!" 1>&2; exit 42; }
+set -o nounset
+set -o pipefail
+shopt -s nullglob
 
-declare -r BOOTSTRAP_DIR=$(std::get_abspath "${BOOTSTRAP_DIR}")
+declare -r BOOTSTRAP_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 declare -r SRC_DIR="${BOOTSTRAP_DIR}/Pmodules"
 
-declare -x PMODULES_ROOT
-declare -x PMODULES_HOME
-declare -x PMODULES_DISTFILESDIR
-declare -x PMODULES_TMPDIR
+source "${SRC_DIR}/libstd.bash"		|| { echo "Oops!" 1>&2; exit 42; }
+source "${SRC_DIR}/libpbuild.bash"	|| { echo "Oops!" 1>&2; exit 42; }
 
+declare -r  PMOD_DIR="Tools/Pmodules/${VERSION}"
+# config directory and file relative to install root
 declare -rx CONFIG_DIR='config'
-declare -rx CONFIG_FILE='Pmodules.yaml'
-declare -rx VERSIONS_CFG_FILE="${CONFIG_DIR}/versions.conf"
-
-# defaults
-declare -rx DEFAULT_PMODULES_ROOT='/opt/psi'
-declare -rx DEFAULT_DISTFILES_DIR="var/distfiles"
-declare -rx DEFAULT_TMPDIR='var/tmp/${USER}'
+declare -rx CONFIG_FILE="${CONFIG_DIR}/Pmodules.yaml"
 
 # directory where the required tools will be installed (like bash, tclsh, etc)
 declare -rx UTILBIN_DIR='libexec'
 
-declare -ix PB_ERR_ARG=1
-declare -ix PB_ERR_SETUP=2
-declare -ix PB_ERR_SYSTEM=3
-declare -ix PB_ERR_DOWNLOAD=4
-declare -ix PB_ERR_UNTAR=5
-declare -ix PB_ERR_CONFIGURE=6
-declare -ix PB_ERR_MAKE=7
-declare -ix PB_ERR_PRE_INSTALL=8
-declare -ix PB_ERR_INSTALL=9
-declare -ix PB_ERR_POST_INSTALL=10
-declare -ix PB_ERR=255
-declare -ix NJOBS=4
-
-pb_exit() {
-        local -i ec=$?
-        if [[ -n "${BASH_VERSION}" ]]; then
-                local -i n=${#BASH_SOURCE[@]}
-                local -r recipe_name="${BASH_SOURCE[n]}"
-        else
-                local -r recipe_name="${ZSH_ARGZERO}"
-        fi
-        echo -n "${recipe_name}: "
-        if (( ec == 0 )); then
-                echo "done!"
-        elif (( ec == PB_ERR_ARG )); then
-                echo "argument error!"
-        elif (( ec == PB_ERR_SETUP )); then
-                echo "error in setting everything up!"
-        elif (( ec == PB_ERR_SYSTEM )); then
-                echo "unexpected system error!"
-        elif (( ec == PB_ERR_DOWNLOAD )); then
-                echo "error in downloading the source file!"
-        elif (( ec == PB_ERR_UNTAR )); then
-                echo "error in un-taring the source file!"
-        elif (( ec == PB_ERR_CONFIGURE )); then
-                echo "error in configuring the software!"
-        elif (( ec == PB_ERR_MAKE )); then
-                echo "error in compiling the software!"
-        elif (( ec == PB_ERR_PRE_INSTALL )); then
-                echo "error in pre-installing the software!"
-        elif (( ec == PB_ERR_INSTALL )); then
-                echo "error in installing the software!"
-        elif (( ec == PB_ERR_POST_INSTALL )); then
-                echo "error in post-installing the software!"
-        else
-                echo "oops, unknown error!!!"
-        fi
-        exit ${ec}
-}
-export -f pb_exit > /dev/null
+# defaults
+declare -rx DEFAULT_INSTALL_ROOT='/opt/psi'
+declare -rx DEFAULT_DISTFILES_DIR='var/distfiles'
+declare -rx DEFAULT_TMP_DIR='var/tmp/${USER}'
 
 #-----------------------------------------------------------------------------
 #
-# Get version from config file.
-#
-# The format of the config file is:
-#
-# <PackageName> <version>
-#
-get_version() {
-	local -r name="$1"
-	echo $(awk "/^$1[[:blank:]]/ {print \$2}" "${VERSIONS_CFG_FILE}")
+read_config_file() {
+	local fname="$1"
+	if [[ ! -r "${fname}" ]]; then
+		std::die 1 "Configuration file '${fname}' does not exist or is not readable!"
+	fi
+
+	eval $(std::parse_yaml "${fname}" '') || \
+		std::die 1 "Cannot read configuration file '${fname}'"
+
+	declare -xg INSTALL_ROOT="${Overlays_base_install_root}"
+	if [[ -z "${INSTALL_ROOT}" ]]; then
+		std::die 1 "Error in configuration file '${fname}': install root not defined!"
+	fi
+	declare -xg PREFIX="${INSTALL_ROOT}/${PMOD_DIR}"
+	declare -xg DOWNLOADS_DIR="${DistfilesDir:-${INSTALL_ROOT}/${DEFAULT_DISTFILES_DIR}}"
+	declare -xg TMP_DIR="${TmpDir:-${INSTALL_ROOT}/${DEFAULT_TMP_DIR}}"
 }
 
+#-----------------------------------------------------------------------------
+# The next functions are used in the sub-commands, if an illegal option
+# or argument has been passed.
 #
-# the Pmodules version is defined in the config file
-#
-declare -rx PMODULES_VERSION=$(get_version 'Pmodules')
+illegal_option(){
+	local subcmd="$1"
+	local opt="$2"
+	std::die 1 \
+		 "%s: %s -- %s" \
+		 "$(basename $0) ${subcmd}" \
+		 "Illegal option" \
+		 "${opt}"
+}
+
+illegal_arg(){
+	local subcmd="$1"
+	local arg="$2"
+	std::die 1 \
+		 "%s: %s -- %s" \
+		 "$(basename $0) ${subcmd}" \
+		 "Illegal argument" \
+		 "${arg}"
+}
 
 #-----------------------------------------------------------------------------
-#
-usage() {
-	local prog=$(basename $0)
+# help for sub-command 'help' (usage)
+build::help_help(){
+	local prog="$(basename "$0")"
 	echo "
 Usage: ${prog} help|configure|compile|install
 
@@ -124,48 +101,36 @@ to get help for a specific sub-command.
 }
 
 #-----------------------------------------------------------------------------
+# sub-command 'help'
 #
-read_config_file() {
-	local fname="$1"
-	if [[ ! -r "${fname}" ]]; then
-		std::die 1 "Configuration file '${fname}' does not exist or is not readable!"
-	fi
-
-	eval $(std::parse_yaml "${fname}" '') || std::die 1 "Cannot read configuration file '${fname}'"
-
-	PMODULES_ROOT="${Overlays_base_install_root}"
-	PMODULES_DISTFILESDIR="${DistfilesDir}"
-	PMODULES_TMPDIR="${TmpDir}"
-	PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
-
-	if [[ -z "${PMODULES_HOME}" ]]; then
-		std::die 1 "Error in configuration file '${fname}': PMODULE_HOME not defined!"
+# print help for sub-commands
+#
+build::help() {
+	if (( $# == 0 )); then
+		build::help_help
+	else
+		case $1 in
+			configure|compile|install )
+				build::help_$1
+				;;
+			help )
+				build::help_help
+				;;
+			-* )
+				illegal_option 'help' "$1"
+				;;
+			* )
+				std::error "No such command -- $1"
+				build::help_help
+				;;
+		esac
 	fi
 }
 
-
-
 #-----------------------------------------------------------------------------
+# help for sub-command 'configure'
 #
-pmodules::help() {
-	if (( $# > 1 )); then
-		usage
-	fi
-	case $1 in
-		configure|compile|install )
-			pmodules::help_$1
-			;;
-		* )
-			echo -en "$1 - invalid sub-command!\n" 1>&2
-			usage
-			;;
-	esac
-}
-
-
-#-----------------------------------------------------------------------------
-#
-pmodules::help_configure() {
+build::help_configure() {
 	echo "
 Usage: $(basename $0) configure [OPTION...]
 
@@ -173,21 +138,24 @@ Configure and setup a new Pmodules environment. You need permissions
 to write to the installation root.
 
 Options:
---prefix=DIR
+--install_root=DIR
 	Root of the Pmodules environment installation. Everything will be
 	installed in a directory hierarchy with 'DIR' as prefix.
-       	The default is '${DEFAULT_PMODULES_ROOT}'.
+       	The default is '${DEFAULT_INSTALL_ROOT}'.
 
 --distfilesdir=DIR
 	Directory where downloaded files are stored.
-	The default is 'PREFIX/${DEFAULT_DISTFILES_DIR}' in the 
+	The default is '${DEFAULT_INSTALL_ROOT}/${DEFAULT_DISTFILES_DIR}' in the 
 	Pmodules root directory.
 
 --tmpdir=DIR
 	Directory for temporary files.
-	The default is 'PREFIX/${DEFAULT_TMPDIR}'
+	The default is '${DEFAULT_INSTALL_ROOT}/${DEFAULT_TMP_DIR}'
 
---help
+--force|-f
+	Override existing configuration.
+
+--help|-h|-?
 	Print this help text.
 
 " 1>&2
@@ -195,110 +163,120 @@ Options:
 }
 
 #-----------------------------------------------------------------------------
+# sub-command 'configure'
 #
-pmodules::configure() {
-	local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}"
-	local distfilesdir=''
-	local tmpdir=''
-	local config_file=''
+build::configure() {
 	local opt_force='no'
 
 	while (( $# > 0 )); do
 		case "$1" in
-			--prefix )
-				prefix="$2"
-				shift 1
-				;;
-			--prefix=* )
-				prefix="${1#*=}"
+			--install_root | --install_root=* )
+				if [[ $1 == *=* ]]; then
+					INSTALL_ROOT="${1#*=}"
+				else
+					INSTALL_ROOT="$2"
+					shift 1
+				fi
 				;;
 			--distfilesdir )
-				distfilesdir="$2"
-				shift 1
-				;;
-			--distfilesdir=* )
-				distfilesdir="${1#*=}"
+				if [[ $1 == *=* ]]; then
+					DOWNLOADS_DIR="${1#*=}"
+				else
+					DOWNLOADS_DIR="$2"
+					shift 1
+				fi
 				;;
 			-f | --force )
 				opt_force='yes'
 				;;
-			--tmpdir )
-				tmpdir="$2"
-				shift 1
-				;;
-			--tmpdir=* )
-				tmpdir="${1#*=}"
+			--tmpdir | --tmpdir=* )
+				if [[ $1 == *=* ]]; then
+					TMP_DIR="${1#*=}"
+				else
+					TMP_DIR="$2"
+					shift 1
+				fi
 				;;
 			--help | -h | -\? )
-				pmodules::help_configure
+				build::help_configure
 				;;
 			-* )
-				std::die 1 "$1: illegal option"
+				illegal_option 'configure' "$1"
 				;;
 			* )
-				std::die 1 "$1: illegal argument to sub-command 'configure'."
+				illegal_arg 'configure' "$1"
 				;;
 		esac
 		shift 1
 	done
-	if [[ ! -d ${prefix} ]]; then
-		echo "The root directory '${prefix}' does not exist, trying to create it..."
-		if ! mkdir -p "${prefix}"; then
-			std::die 1 "Creating the root directory failed!\nAborting..."
+	: ${INSTALL_ROOT:=${DEFAULT_INSTALL_ROOT}}
+	: ${DOWNLOADS_DIR:=${INSTALL_ROOT}/${DEFAULT_DISTFILES_DIR}}
+	: ${TMP_DIR:=${INSTALL_ROOT}/${DEFAULT_TMP_DIR}}
+	PREFIX="${INSTALL_ROOT}/${PMOD_DIR}"
+
+	#---
+	# check/create the install root
+	if [[ ! -d ${INSTALL_ROOT} ]]; then
+		std::info "%s\n%s" \
+			  "The root directory '${INSTALL_ROOT}' does not exist!" \
+			  "Trying to create it..."
+		if ! mkdir -p "${INSTALL_ROOT}"; then
+			std::die 1 "%s\n%s" \
+				 "Creating the root directory failed!" \
+				 "Aborting..."
 		fi
 	fi
-	if [[ ! -w ${prefix} ]]; then
-		std::die 1 "The root directory '${prefix}' is not writable!\nAborting..."
+	if [[ ! -w ${INSTALL_ROOT} ]]; then
+		std::die 1 "%s\n%s" \
+			 "The root directory '${INSTALL_ROOT}' is not writable!" \
+			 "Aborting..."
 	fi
-	mkdir -p "${prefix}/${CONFIG_DIR}" || \
+
+	#---
+	# check/create YAML config file in install root
+	mkdir -p "${INSTALL_ROOT}/${CONFIG_DIR}" || \
 		std::die 1 "Aborting..."
 
-	local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}"
-	if [[ "${opt_force}" == 'yes' ]]; then
-		rm -f "${config_file}"
+	local config_file="${INSTALL_ROOT}/${CONFIG_FILE}"
+	if [[ "${opt_force}" != 'yes' ]] && [[ -e "${config_file}" ]]; then
+		std::die 1 "%s\n%s" \
+			 "The Pmodules environment in '${INSTALL_ROOT}' has already been configured!" \
+			 "Use the option --force to override. Aborting..."
 	fi
 
-	if [[ -e "${config_file}" ]]; then
-		std::die 1 "The Pmodules environment has already been configured!
-Use the option --force to override.\nAborting..."
-	fi
-
-	[[ -z "${distfilesdir}" ]] && distfilesdir="${prefix}/${DEFAULT_DISTFILES_DIR}"
-	[[ -z "${tmpdir}" ]] && tmpdir="${prefix}/${DEFAULT_TMPDIR}"
-
-	sed_cmd="s:@INSTALL_ROOT@:${prefix}:g;"
-	sed_cmd+="s:@PMODULES_DISTFILESDIR@:${distfilesdir}:g;"
-	sed_cmd+="s:@PMODULES_TMPDIR@:${tmpdir}:g;"
-        sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g"
+	sed_cmd="s:@INSTALL_ROOT@:${INSTALL_ROOT}:g;"
+	sed_cmd+="s:@PMODULES_DISTFILESDIR@:${DOWNLOADS_DIR}:g;"
+	sed_cmd+="s:@PMODULES_TMPDIR@:${TMP_DIR}:g;"
+        sed_cmd+="s:@PMODULES_VERSION@:${VERSION}:g"
         
-	sed "${sed_cmd}" "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}.in" \
+	sed "${sed_cmd}" "${BOOTSTRAP_DIR}/${CONFIG_FILE}.in" \
 		> "${config_file}" || \
 		std::die 1 "Cannot create configuration file in Pmodules root\nAborting..."
 
-	sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" > "${SRC_DIR}/libpmodules.bash"
-	chmod 0755 "${SRC_DIR}/libpmodules.bash"
-
-	read_config_file "${config_file}"
-	install -d -m 0755 "${PMODULES_HOME}/bin"
-	install -d -m 0755 "${PMODULES_HOME}/init"
-	install -d -m 0755 "${PMODULES_HOME}/lib"
-	install -d -m 0755 "${PMODULES_HOME}/libexec"
-	install -d -m 0755 "${PMODULES_ROOT}/Tools/modulefiles/Pmodules"
-	install -d -m 0755 "${PMODULES_ROOT}/Libraries/modulefiles"
-	install -d -m 0755 "${PMODULES_ROOT}/Programming/modulefiles"
-	install -d -m 0755 "${distfilesdir}"
+	#---
+	# create basic directories
+	install -d -m 0755 \
+		"${INSTALL_ROOT}/Tools/modulefiles/Pmodules" \
+		"${INSTALL_ROOT}/Libraries/modulefiles" \
+		"${INSTALL_ROOT}/Programming/modulefiles" \
+		"${DOWNLOADS_DIR}" || \
+		std::die 1 "%s" \
+			 "Creating basic directories failed\n" \
+			 "Aborting..."
 
+	#---
 	echo "Configuration:"
-	echo "  root of Pmodules environment: ${prefix}"
-	echo "  Pmodule prefix:               ${PMODULES_HOME}"
-	echo "  tmp directory:                ${tmpdir}"
-	echo "  store for downloaded files:   ${distfilesdir}"
+	echo "  root of Pmodules environment: ${INSTALL_ROOT}"
+	echo "  Pmodule prefix:               ${PREFIX}"
+	echo "  tmp directory:                ${TMP_DIR}"
+	echo "  store for downloaded files:   ${DOWNLOADS_DIR}"
 	echo "Done..."
 }
 
 #-----------------------------------------------------------------------------
+# help for sub-command 'compile'
 #
-pmodules::help_compile() {
+build::help_compile() {
 	echo "
 Usage: $(basename $0) compile [OPTION...]
 
@@ -306,22 +284,14 @@ Compile and install the required tools for a new Pmodules environment.
 ou need the permissions to write to the installation root.
 
 Options:
---prefix=DIR
-	Root of the Pmodules environment installation. The root of the
-       	installation must be either specified via this option or the
-	environment variable PMODULES_ROOT. If this option is used and
-	the PMODULES_ROOT is set, the directory specified with this 
-	option will be used.
+--install_root=DIR
+	Root of the Pmodules environment installation. Everything will be
+	installed in a directory hierarchy with 'DIR' as prefix.
+       	The default is '${DEFAULT_INSTALL_ROOT}'.
 
---debug
-	Enable verbose/debug output.
-
---disable-cleanup )
+--disable-cleanup
 	Do not cleanup the tmp directory after compilation and installation.
 
---force | -f
-	Force compilation.
-
 --help
 	Print this help text.
 
@@ -329,252 +299,208 @@ Options:
 	std::die 1 ""
 }
 
-pmodules::compile() {
-	local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}"
+#-----------------------------------------------------------------------------
+# sub-command 'compile'
+#
+build::compile() {
 	local opt_force='no'
-	local config_file=''
+	local opt_cleanup='yes'
 
 	while (( $# > 0 )); do
 		case $1 in
-			--prefix )
-				prefix="$2"
-				shift 1
-				;;
-			--prefix=* )
-				prefix="${1#*=}"
+			--install_root | --install_root=* )
+				if [[ $1 == *=* ]]; then
+					INSTALL_ROOT="${1#*=}"
+				else
+					INSTALL_ROOT="$2"
+					shift 1
+				fi
 				;;
 			--disable-cleanup )
-				build_opts+=( "$1" )
-				;;
-			--debug )
-				build_opts+=( "$1" )
-				;;
-			-f | --force )
-				opt_force='yes'
+				opt_cleanup='no'
 				;;
 			--help | -h | -\? )
-				pmodules::help_compile
+				build::help_compile
 				;;
 			-* )
-				std::die 1 "$1: illegal option"
+				illegal_option 'compile' "$1"
 				;;
 			* )
-				std::die 1 "$1: illegal argument for  sub-command 'compile'."
+				illegal_arg 'compile' "$1"
 				;;
 		esac
 		shift 1
 	done
+	: ${INSTALL_ROOT:=${DEFAULT_INSTALL_ROOT}}
+	PREFIX="${INSTALL_ROOT}/${PMOD_DIR}"
 
-	local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}"
-	read_config_file "${config_file}"
-	install -d -m 0755 "${PMODULES_HOME}/bin"
-	install -d -m 0755 "${PMODULES_HOME}/init"
-	install -d -m 0755 "${PMODULES_HOME}/lib"
-	install -d -m 0755 "${PMODULES_HOME}/libexec"
+	read_config_file "${INSTALL_ROOT}/${CONFIG_FILE}"
 
 	echo "Configuration:"
-	echo "  root of Pmodules environment: ${prefix}"
-	echo "  Pmodule prefix:               ${PMODULES_HOME}"
+	echo "  root of Pmodules environment: ${INSTALL_ROOT}"
+	echo "  Pmodule prefix:               ${PREFIX}"
 
-	if [[ "${OS}" == 'Darwin' ]]; then
-		if [[ ! -f "${PMODULES_HOME}/${UTILBIN_DIR}/getopt" ]] || [[ ${opt_force} == 'yes' ]]; then
-			: build getopt
-		fi
+	install -m 0755 -d "${PREFIX}"/{bin,init,lib,libexec} \
 
-		if [[ ! -f "${PMODULES_HOME}/${UTILBIN_DIR}/find" ]] || [[ ${opt_force} == 'yes' ]]; then
-			: build findutils
-		fi
+	for recipe in recipes/[0-9]*; do
+		"./${recipe}" "${PREFIX}"
+	done
+	if [[ "${opt_cleanup}" == 'yes' ]]; then
+		rm -rf "${TMP_DIR}/*"
+		rm -f  "${PREFIX}/lib/libtcl*.a"
+		rm -rf "${PREFIX}/include"
 	fi
-
-	if [[ ! -f "${PMODULES_HOME}/${UTILBIN_DIR}/bash" ]] || [[ ${opt_force} == 'yes' ]]; then
-		./10-build-bash
-	fi
-
-	if [[ ! -e "${PMODULES_HOME}/${UTILBIN_DIR}/tclsh" ]] || [[ ${opt_force} == 'yes' ]]; then
-		./20-build-tcl
-	fi
-
-	if [[ ! -e "${PMODULES_HOME}/lib/tcllib1.20" ]] || [[ ${opt_force} == 'yes' ]]; then
-		./30-build-tcllib
-	fi
-
-	if [[ ! -e "${PMODULES_HOME}/libexec/modulecmd.bin" ]] || [[ ${opt_force} == 'yes' ]]; then
-		./40-build-modules
-	fi
-	#rm -rf "${PMODULES_HOME}/include"
-	#rm -rf "${PMODULES_HOME}/lib/"*.a
-	#rm -rf "${PMODULES_HOME}/lib/"*.la
-	#rm -rf "${PMODULES_HOME}/lib/bash"
-	#rm -rf "${PMODULES_HOME}/lib/pkginfo"
-	#rm -rf "${PMODULES_HOME}/man"
-	#rm -rf "${PMODULES_HOME}/share"
-
 	echo "Done..."
 }
 
 #-----------------------------------------------------------------------------
+# help for sub-command 'install'
 #
-pmodules::help_install() {
+build::help_install() {
 	echo "
 Usage: $(basename $0) install [OPTION...]
 
 Install a new Pmodules version.
 
 Options:
---prefix=DIR
-	Root of the Pmodules environment installation. The root of the
-       	installation must be either specified via this option or the
-	environment variable PMODULES_ROOT. If this option is used and
-	the PMODULES_ROOT is set, the directory specified with this 
-	option will be used.
+--install_root=DIR
+	Root of the Pmodules environment installation. Everything will be
+	installed in a directory hierarchy with 'DIR' as prefix.
+       	The default is '${DEFAULT_INSTALL_ROOT}'.
 
 --debug
 	Enable verbose/debug output.
 
---disable-cleanup )
-	Do not cleanup the tmp directory after compilation and installation.
-
---force | -f
-	Force compilation.
-
---help
+--help|-h|-?
 	Print this help text.
 
 " 1>&2
 	std::die 1 ""
 }
 
-pmodules::install() {
-	if [[ -v PMOULES_HOME ]]; then
-		local prefix="${PMODULES_HOME%%/Tools*}"
-	else
-		local prefix="${DEFAULT_PMODULES_ROOT}"
-	fi
-	local config_file=''
-	local opt_force='no'
-
+#-----------------------------------------------------------------------------
+# sub-command 'install'
+#
+build::install() {
 	while (( $# > 0 )); do
 		case $1 in
 			--debug )
 				set -x
 				;;
-			--prefix )
-				prefix="$2"
-				shift 1
-				;;
-			--prefix=* )
-				prefix="${1#*=}"
-				;;
-			-f | --force )
-				opt_force='yes'
+			--install_root | --install_root=* )
+				if [[ $1 == *=* ]]; then
+					INSTALL_ROOT="${1#*=}"
+				else
+					INSTALL_ROOT="$2"
+					shift 1
+				fi
 				;;
 			--help | -h | -\? )
-				pmodules::help_install
+				build::help_install
 				;;
 			-* )
-				std::die 1 "$1: illegal option"
+				illegal_option 'install' "$1"
 				;;
 			* )
-				std::die 1 "$1: illegal argument to sub-command 'install'."
+				illegal_arg 'install' "$1"
 				;;
 		esac
 		shift 1
 	done
 
-	local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}"
-	read_config_file "${config_file}"
+	: ${INSTALL_ROOT:=${DEFAULT_INSTALL_ROOT}}
+	PREFIX="${INSTALL_ROOT}/${PMOD_DIR}"
+
+	read_config_file "${INSTALL_ROOT}/${CONFIG_FILE}"
 
 	###
 	#
 	# begin installation
 	#
 	echo "Configuration:"
-	echo "  root of Pmodules environment: ${prefix}"
-	echo "  Pmodule prefix:               ${PMODULES_HOME}"
-	sed_cmd="s:@PMODULES_HOME@:${PMODULES_HOME}:g;"
-	sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g;"
-	sed_cmd+="s:@MODULES_VERSION@:${MODULES_VERSION}:g;"
-	sed_cmd+="s:@PMODULES_DISTFILESDIR@:${PMODULES_DISTFILESDIR}:g;"
-	sed_cmd+="s:@PMODULES_TMPDIR@:${PMODULES_TMPDIR}:g;"
-	sed_cmd+="s:@TCLSHDIR@:${PMODULES_HOME}/${UTILBIN_DIR}:g;"
-	sed_cmd+="s:@pager@::g;"
-	sed_cmd+="s:@pageropts@::g;"
-	sed_cmd+="s:@etcdir@:${PMODULES_ROOT}/${CONFIG_DIR}:g;"
+	echo "  root of Pmodules environment: ${INSTALL_ROOT}"
+	echo "  Pmodule prefix:               ${PREFIX}"
+	sed_cmd+="s:@PMODULES_VERSION@:${VERSION}:g;"
 	sed_cmd+="s:@VERSIONING@:#:g;"
-	sed_cmd+="s:@prefix@:${PMODULES_HOME}:g;"
-	sed_cmd+="s:@initdir@:${PMODULES_HOME}/init:g;"
-	sed_cmd+="s:@MODULES_RELEASE@:${PMODULES_VERSION}:g;"
-	sed_cmd+="s:@BASH@:${PMODULES_HOME}/${UTILBIN_DIR}/bash:g;"
-	sed_cmd+="s:@MODULECMD@:${PMODULES_HOME}/${UTILBIN_DIR}/modulecmd.bash:g;"
-	sed_cmd+="s:@MODMANAGE@:${PMODULES_HOME}/${UTILBIN_DIR}/modmanage.bash:g;"
-	
-	sed "${sed_cmd}" "${SRC_DIR}/profile.bash.in"     > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.bash-${PMODULES_VERSION}"
-	sed "${sed_cmd}" "${SRC_DIR}/profile.csh.in"      > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.csh-${PMODULES_VERSION}"
-	sed "${sed_cmd}" "${SRC_DIR}/profile.zsh.in"      > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.zsh-${PMODULES_VERSION}"
-	chmod 0644 "${PMODULES_ROOT}/${CONFIG_DIR}"/*-${PMODULES_VERSION}
+	sed_cmd+="s:@BASH@:${PREFIX}/${UTILBIN_DIR}/bash:g;"
+	sed_cmd+="s:@MODULECMD@:${PREFIX}/${UTILBIN_DIR}/modulecmd.bash:g;"
 
-	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.bash" || \
-		install -m 0644 "$_-${PMODULES_VERSION}" "$_"
+	sed "${sed_cmd}" "${SRC_DIR}/profile.bash.in" \
+	    > "${INSTALL_ROOT}/${CONFIG_DIR}/profile.bash-${VERSION}"
+	sed "${sed_cmd}" "${SRC_DIR}/profile.csh.in" \
+	    > "${INSTALL_ROOT}/${CONFIG_DIR}/profile.csh-${VERSION}"
+	sed "${sed_cmd}" "${SRC_DIR}/profile.zsh.in" \
+	    > "${INSTALL_ROOT}/${CONFIG_DIR}/profile.zsh-${VERSION}"
+	chmod 0644 "${INSTALL_ROOT}/${CONFIG_DIR}"/*-${VERSION}
 
-	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.csh" || \
-		install -m 0644 "$_-${PMODULES_VERSION}" "$_"
+	test -e "${INSTALL_ROOT}/${CONFIG_DIR}/profile.bash" || \
+		install -m 0644 "$_-${VERSION}" "$_"
 
-	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.zsh" || \
-		install -m 0644 "$_-${PMODULES_VERSION}" "$_"
+	test -e "${INSTALL_ROOT}/${CONFIG_DIR}/profile.csh" || \
+		install -m 0644 "$_-${VERSION}" "$_"
 
-	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.in"        > "${PMODULES_HOME}/bin/modulecmd"
-	chmod 0755 "${PMODULES_HOME}/bin/modulecmd"
-	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in"   > "${PMODULES_HOME}/libexec/modulecmd.bash"
-	chmod 0755 "${PMODULES_HOME}/libexec/modulecmd.bash"
-	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in"    > "${PMODULES_HOME}/libexec/modulecmd.tcl"
-	chmod 0755 "${PMODULES_HOME}/libexec/modulecmd.tcl"
+	test -e "${INSTALL_ROOT}/${CONFIG_DIR}/profile.zsh" || \
+		install -m 0644 "$_-${VERSION}" "$_"
 
-	sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" > "${SRC_DIR}/libpmodules.bash"
+	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.in" \
+            > "${PREFIX}/bin/modulecmd"
+	chmod 0755 "${PREFIX}/bin/modulecmd"
+	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" \
+	    > "${PREFIX}/libexec/modulecmd.bash"
+	chmod 0755 "${PREFIX}/libexec/modulecmd.bash"
+	sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in" \
+	    > "${PREFIX}/libexec/modulecmd.tcl"
+	chmod 0755 "${PREFIX}/libexec/modulecmd.tcl"
+
+	sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" \
+	    > "${SRC_DIR}/libpmodules.bash"
 	chmod 0755 "${SRC_DIR}/libpmodules.bash"
 
-	sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in"    > "${PMODULES_HOME}/lib/libpmodules.bash"
-	chmod 0755 "${PMODULES_HOME}/lib/libpmodules.bash"
+	sed "${sed_cmd}" "${SRC_DIR}/libpmodules.bash.in" \
+	    > "${PREFIX}/lib/libpmodules.bash"
+	chmod 0755 "${PREFIX}/lib/libpmodules.bash"
 
-        sed "${sed_cmd}" "${SRC_DIR}/modbuild.in"         > "${PMODULES_HOME}/bin/modbuild"
-	chmod 0755 "${PMODULES_HOME}/bin/modbuild"
+        sed "${sed_cmd}" "${SRC_DIR}/modbuild.in" \
+            > "${PREFIX}/bin/modbuild"
+	chmod 0755 "${PREFIX}/bin/modbuild"
 
-	sed "${sed_cmd}" "${SRC_DIR}/modmanage.in"        > "${PMODULES_HOME}/bin/modmanage"
-	chmod 0755 "${PMODULES_HOME}/bin/modmanage"
-	sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in"   > "${PMODULES_HOME}/libexec/modmanage.bash"
-	chmod 0755 "${PMODULES_HOME}/libexec/modmanage.bash"
+	sed "${sed_cmd}" "${SRC_DIR}/modmanage.in" \
+            > "${PREFIX}/bin/modmanage"
+	chmod 0755 "${PREFIX}/bin/modmanage"
+	sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in" \
+	    > "${PREFIX}/libexec/modmanage.bash"
+	chmod 0755 "${PREFIX}/libexec/modmanage.bash"
 
-	test -e "${PMODULES_ROOT}/${CONFIG_DIR}/Pmodules.yaml" || \
-		install -m 0644 "$_"			"${PMODULES_ROOT}/${CONFIG_DIR}"
+	test -e "${INSTALL_ROOT}/${CONFIG_FILE}" || \
+		install -m 0644 "$_"			"${INSTALL_ROOT}/${CONFIG_DIR}"
 	
-	install -m 0755 "${SRC_DIR}/yq.$(uname -m)_$(uname -s)"	"${PMODULES_HOME}/libexec/yq"
-	install -m 0644 "${SRC_DIR}/bash"		"${PMODULES_HOME}/init"
-	install -m 0644 "${SRC_DIR}/bash_completion"	"${PMODULES_HOME}/init"
-	install -m 0644 "${SRC_DIR}/csh"		"${PMODULES_HOME}/init"
-	install -m 0644 "${SRC_DIR}/zsh"		"${PMODULES_HOME}/init"
+	install -m 0755 "${SRC_DIR}/yq.$(uname -m)_$(uname -s)"	"${PREFIX}/libexec/yq"
+	install -m 0644 "${SRC_DIR}/bash"		"${PREFIX}/init"
+	install -m 0644 "${SRC_DIR}/bash_completion"	"${PREFIX}/init"
+	install -m 0644 "${SRC_DIR}/csh"		"${PREFIX}/init"
+	install -m 0644 "${SRC_DIR}/zsh"		"${PREFIX}/init"
 
-	install -m 0644 "${SRC_DIR}/libpbuild.bash"	"${PMODULES_HOME}/lib"
-	install -m 0644 "${SRC_DIR}/libpbuild_dyn.bash"	"${PMODULES_HOME}/lib"
-	install -m 0644 "${SRC_DIR}/libstd.bash"	"${PMODULES_HOME}/lib"
-	install -m 0755 -d				"${PMODULES_HOME}/lib/Pmodules"
-	install -m 0644 "${SRC_DIR}/libmodules.tcl"	"${PMODULES_HOME}/lib/Pmodules"
+	install -m 0644 "${SRC_DIR}/libpbuild.bash"	"${PREFIX}/lib"
+	install -m 0644 "${SRC_DIR}/libpbuild_dyn.bash"	"${PREFIX}/lib"
+	install -m 0644 "${SRC_DIR}/libstd.bash"	"${PREFIX}/lib"
+	install -m 0755 -d				"${PREFIX}/lib/Pmodules"
+	install -m 0644 "${SRC_DIR}/libmodules.tcl"	"${PREFIX}/lib/Pmodules"
 
 	{
-		PATH="${PMODULES_HOME}/${UTILBIN_DIR}:${PATH}"
-		cd "${PMODULES_HOME}/lib/Pmodules"
+		PATH="${PREFIX}/${UTILBIN_DIR}:${PATH}"
+		cd "${PREFIX}/lib/Pmodules"
 		"${BOOTSTRAP_DIR}/mkindex.tcl"
 	}
 
-	install -m 0644 "${SRC_DIR}/modulefile" "${PMODULES_ROOT}/Tools/modulefiles/Pmodules/${PMODULES_VERSION}"
+	install -m 0644 \
+		"${SRC_DIR}/modulefile" \
+		"${INSTALL_ROOT}/Tools/modulefiles/Pmodules/${VERSION}"
 
 	echo "Done..."
 }
 
 #=============================================================================
 #
-
-declare -a build_opts=()
-build_opts+=( '--bootstrap' )
-
 declare subcmd=''
 declare -a subcmd_args=()
 
@@ -605,7 +531,7 @@ done
 
 [[ -n "${subcmd}" ]] || std::die 1 "Missing sub-command.\n\nUse 'build --help' to get help..."
 
-pmodules::${subcmd} "${subcmd_args[@]}"
+build::${subcmd} "${subcmd_args[@]}"
 
 # Local Variables:
 # mode: sh
diff --git a/config/Pmodules.yaml b/config/Pmodules.yaml
deleted file mode 100644
index 43ca4f8..0000000
--- a/config/Pmodules.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-DefaultGroups: Tools:Programming
-DefaultReleaseStages: stable
-ReleaseStages: unstable:stable:deprecated
-
-Overlays:
-  base:
-    install_root: @INSTALL_ROOT@
diff --git a/config/modbuild.conf.in b/config/modbuild.conf.in
deleted file mode 100644
index 6292ea6..0000000
--- a/config/modbuild.conf.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-: ${PMODULES_DISTFILESDIR:=@PMODULES_DISTFILESDIR@}
-: ${PMODULES_TMPDIR:=@PMODULES_TMPDIR@}
-export     PMODULES_DISTFILESDIR
-export     PMODULES_TMPDIR
-
-declare -x PMODULES_HOME="@PMODULES_ROOT@/Tools/Pmodules/${PMODULES_VERSION}"
-
-declare -x DefaultGroups='Tools Programming'
-declare    ReleaseStages=':unstable:stable:deprecated:'
-declare    DefaultReleaseStages='stable'
-
diff --git a/config/versions.conf b/config/versions.conf
deleted file mode 100644
index 2cbdbab..0000000
--- a/config/versions.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-bash		5.1.16
-findutils	4.9.0
-getopt		1.1.6
-modules		3.2.10.1
-Pmodules	1.1.10
-Tcl		8.6.12
-tcllib		1.20
diff --git a/10-build-bash b/recipes/010-bash
similarity index 60%
rename from 10-build-bash
rename to recipes/010-bash
index 8ac20b7..4956448 100755
--- a/10-build-bash
+++ b/recipes/010-bash
@@ -2,29 +2,14 @@
 #
 # https://www.gnu.org/software/bash/
 #
-
-set -x
-
 P=bash
 V=${BASH5_VERSION:-5.1.16}
-
 FNAME="$P-$V.tar.gz"
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/$P/${FNAME}"
 
-PREFIX="${PMODULES_HOME}"
-SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
-SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
-BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
-
-trap "pb_exit" EXIT
-
-# download
-test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
-
-# unpack
-mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
-tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
+source "$(dirname "$0")/librecipes.bash"
 
+#---
 # configure
 mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 loadablesdir="${PREFIX}/${UTILBIN_DIR}/builtins" \
@@ -33,15 +18,24 @@ loadablesdir="${PREFIX}/${UTILBIN_DIR}/builtins" \
 	--bindir="${PREFIX}/${UTILBIN_DIR}" \
         || exit ${PB_ERR_CONFIGURE}
 
-# compile & install
+#---
+# compile
 make -j ${NJOBS} || exit ${PB_ERR_MAKE}
 make -C examples/loadables -j ${NJOBS} || exit ${PB_ERR_MAKE}
+
+#---
+# install
 make install || exit ${PB_ERR_INSTALL}
 
+#---
 # post-install
 rm -rf "${PREFIX}/include/bash"
 rm -rf "${PREFIX}/share/locale"
+rm -rf "${PREFIX}/share/doc"
+rm -rf "${PREFIX}/share/info"
+rm -rf "${PREFIX}/share/man/man1/bash"*
 
+#---
 # Local Variables:
 # mode: shell-script-mode
 # sh-basic-offset: 8
diff --git a/20-build-tcl b/recipes/020-tcl
similarity index 86%
rename from 20-build-tcl
rename to recipes/020-tcl
index 6b54d94..0e380e0 100755
--- a/20-build-tcl
+++ b/recipes/020-tcl
@@ -2,29 +2,23 @@
 #
 # https://www.tcl.tk
 #
-
-set -x
-
 P=tcl
 V=${TCL_VERSION:-8.6.12}
-
 FNAME="$P$V-src.tar.gz"
 DOWNLOAD_URL="https://prdownloads.sourceforge.net/tcl/${FNAME}"
 
-PREFIX="${PMODULES_HOME}"
-SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
-SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
-BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
-
-trap "pb_exit" EXIT
+source "$(dirname "$0")/librecipes.bash"
 
+#---
 # download
 test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
 
+#---
 # unpack
 mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
 
+#---
 # configure
 mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 case $(uname -s) in
@@ -46,15 +40,20 @@ esac
 	--enable-shared=no \
         || exit ${PB_ERR_CONFIGURE}
 
+#---
 # compile & install
 make -j ${NJOBS} || exit ${PB_ERR_MAKE}
 make install || exit ${PB_ERR_INSTALL}
 
+#---
 # post-install
 { cd "${PREFIX}/${UTILBIN_DIR}" && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+
+rm -rf "${PREFIX}/share/man/man1/tclsh.1"
 rm -rf "${PREFIX}/share/man/man3"
 rm -rf "${PREFIX}/share/man/mann"
 
+#---
 # Local Variables:
 # mode: shell-script-mode
 # sh-basic-offset: 8
diff --git a/30-build-tcllib b/recipes/030-tcllib
similarity index 73%
rename from 30-build-tcllib
rename to recipes/030-tcllib
index c81a0a0..6497227 100755
--- a/30-build-tcllib
+++ b/recipes/030-tcllib
@@ -2,28 +2,21 @@
 #
 # https://core.tcl-lang.org
 #
-
-set -x
-
 P=tcllib
 V=${TCLLIB_VERSION:-1.21}
-
 FNAME="$P-$V.tar.gz"
 DOWNLOAD_URL="https://core.tcl-lang.org/tcllib/uv/${FNAME}" 
-PREFIX="${PMODULES_HOME}"
-SRC_FILE="${PMODULES_DISTFILESDIR}/${FNAME}"
-SRC_DIR="${PMODULES_TMPDIR}/$P-$V/src"
-BUILD_DIR="${PMODULES_TMPDIR}/$P-$V/build"
 
-trap "pb_exit" EXIT
+source "$(dirname "$0")/librecipes.bash"
 
+#---
 # download
 test -r "${SRC_FILE}" || curl -L --output "$_" "${DOWNLOAD_URL}" || exit ${PB_ERR_DOWNLOAD}
 
+#---
 # unpack
 mkdir -p "${SRC_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 tar --directory "${SRC_DIR}" --strip-components 1 -xv -f "${SRC_FILE}" || exit ${PB_ERR_UNTAR}
-
 # configure
 mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 "${SRC_DIR}"/configure \
@@ -31,13 +24,24 @@ mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
 	--mandir="${PREFIX}/share/man" \
         || exit ${PB_ERR_CONFIGURE}
 
+#---
 # compile & install
 make -j ${NJOBS} || exit ${PB_ERR_MAKE}
 make install || exit ${PB_ERR_INSTALL}
 
+#---
 # post-install
 rm -rf "${PREFIX}/share/man/mann"
+rm -f  "${PREFIX}/bin/dtplite"
+rm -f  "${PREFIX}/bin/mkdoc"
+rm -f  "${PREFIX}/bin/nns"
+rm -f  "${PREFIX}/bin/nnsd"
+rm -f  "${PREFIX}/bin/nnslog"
+rm -f  "${PREFIX}/bin/page"
+rm -f  "${PREFIX}/bin/pt"
+rm -f  "${PREFIX}/bin/tcldocstrip"
 
+#---
 # Local Variables:
 # mode: shell-script-mode
 # sh-basic-offset: 8
diff --git a/recipes/040-modules b/recipes/040-modules
new file mode 100755
index 0000000..5c8dca5
--- /dev/null
+++ b/recipes/040-modules
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# https://core.tcl-lang.org
+#
+P=modules
+V=${MODULES_VERSION:-3.2.10.1}
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
+
+source "$(dirname "$0")/librecipes.bash"
+
+#---
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+case $(uname -s) in
+	Linux )
+		declare -x LIBS="-lz -lpthread"
+		;;
+	Darwin )
+		declare -x LIBS="-lz -framework CoreFoundation"
+		;;
+	* )
+		echo "Oops: unsupported OS!" 1>&2
+		exit ${PB_ERR_SYSTEM}
+		;;
+esac
+CPPFLAGS="-DUSE_INTERP_ERRORLINE" \
+"${SRC_DIR}"/configure \
+	--prefix="${PREFIX}" \
+	--exec-prefix="${PREFIX}" \
+	--with-module-path="${PREFIX%%/Tools*}/Tools/${PMODULES_MODULEFILES_DIR}" \
+	--with-tcl="${PREFIX}/lib" \
+	--without-x \
+	--disable-versioning \
+        || exit ${PB_ERR_CONFIGURE}
+
+#---
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+#---
+# post-install
+mkdir -p "${PREFIX}/share/man/man1"
+mkdir -p "${PREFIX}/share/man/man4"
+mv -v    "${PREFIX}/Modules/share/man/man1/module.1" "${PREFIX}/share/man/man1"
+mv -v    "${PREFIX}/Modules/share/man/man4/modulefile.4" "${PREFIX}/share/man/man4"
+mkdir -p "${PREFIX}/libexec"
+cp -v    "${BUILD_DIR}/modulecmd" "${PREFIX}/libexec/modulecmd.bin" || exit 1
+
+rm -rf  "${PREFIX}/Modules"
+rm -f	"${PREIX}"/init/{ksh,perl.pm,python.py,ruby.rb,cmake,.modulespath}
+
+#---
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End: