diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash
index 7c02bbb..bc60340 100644
--- a/Pmodules/libstd.bash
+++ b/Pmodules/libstd.bash
@@ -51,6 +51,7 @@ file=$(std::def_cmd 'file');		declare -r file
 find=$(std::def_cmd 'find');		declare -r find
 getopt=$(std::def_cmd 'getopt');	declare -r getopt
 grep=$(std::def_cmd 'grep');		declare -r grep
+hostname=$(std::def_cmd 'hostname');	declare -r hostname
 install=$(std::def_cmd 'install');	declare -r install
 logger=$(std::def_cmd 'logger');	declare -r logger
 make=$(std::def_cmd 'make');		declare -r make
diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 03d7788..94c7c95 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -64,6 +64,9 @@ TmpFile=$( ${mktemp} /tmp/Pmodules.XXXXXX ) \
 	|| std::die 1 "Oops: unable to create tmp file!"
 declare -r TmpFile
 
+HostName=$(${hostname} -f)
+declare -r HostName
+
 declare -A Subcommands=()
 declare -A Options=()
 declare -A Help=()
@@ -393,7 +396,7 @@ is_available(){
 		[[ -z ${ref_cfg['blocklist']} ]] && return 0
 		local -- s=''
 		for s in ${ref_cfg['blocklist']}; do
-			if [[ "${os_release}" =~ $s ]] || [[ "${HOSTNAME}" =~ $s ]]; then
+			if [[ "${os_release}" =~ $s ]] || [[ "${HostName}" =~ $s ]]; then
 				return 0
 			fi
 		done
@@ -403,7 +406,7 @@ is_available(){
 		[[ -z ${ref_cfg['systems']} ]] && return 0
 		local -- s=''
 		for s in ${ref_cfg['systems']}; do
-			if [[ "${os_release}" =~ $s ]] || [[ "${HOSTNAME}" =~ $s ]]; then
+			if [[ "${os_release}" =~ $s ]] || [[ "${HostName}" =~ $s ]]; then
 				return 0
 			fi
 		done