diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 2f8d894..bbf28e1 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -32,11 +32,10 @@ std::def_cmds "${path}" \
 	      'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \
 	      'rm' 'sed' 'sort' 'yq'
 
-if [[ -n ${TCLLIBPATH} ]]; then
-	declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules:${TCLLIBPATH}"
-else
-	declare -x TCLLIBPATH="${PMODULES_HOME}/lib/Pmodules"
-fi
+declare -rx TCL_LIBRARY="${PMODULES_HOME}/lib/tcl@TCL_VERSION@"
+declare -x  TCLLIBPATH
+std::prepend_path TCLLIBPATH "${PMODULES_HOME}/lib/Pmodules"
+
 declare -r modulecmd="${libexecdir}/modulecmd.bin"
 
 declare -- verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}
diff --git a/build b/build
index bee2ad5..7bd72cd 100755
--- a/build
+++ b/build
@@ -458,9 +458,6 @@ build::install() {
 	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" \
 	    > "${PREFIX}/lib/libpmodules.bash"