diff --git a/tcshrc.system.common b/tcshrc.system.common
index b2071aa..4df918e 100644
--- a/tcshrc.system.common
+++ b/tcshrc.system.common
@@ -121,6 +121,8 @@ _debug "Hostname detected as ${CSHENV_HOSTNAME}..."
 if( $?CSHENV_VIRTUAL_HOSTNAME ) then
 	setenv CSHENV_HOSTNAME ${CSHENV_VIRTUAL_HOSTNAME}
 	_debug "Hostname overriden as ${CSHENV_HOSTNAME}..."
+else
+	setenv CSHENV_HOSTNAME "${HOST}${CSHENV_MACHINE_SUFFIX}"
 endif