2 files changed, 3 insertions, 3 deletions
diff --git a/ksh/kshrc b/ksh/kshrc
index 2f0d31a6..cf7812d6 100644
--- a/ksh/kshrc
+++ b/ksh/kshrc
@@ -6,9 +6,6 @@ set -o emacs
 HISTFILE=$HOME/.ksh_history
 HISTSIZE=$((1 << 10))
 
-# If HOSTNAME isn't set by this version of ksh, set it
-HOSTNAME=$(uname -n)
-
 # Load any supplementary scripts
 for kshrc in "$HOME"/.kshrc.d/*.ksh ; do
     [[ -e $kshrc ]] && . "$kshrc"
diff --git a/sh/shrc b/sh/shrc
index 6c4eac8b..8bbc5147 100644
--- a/sh/shrc
+++ b/sh/shrc
@@ -7,6 +7,9 @@ command -p stty -ixon -ctlecho 2>/dev/null
 # Keep around 4K lines of history in memory
 HISTSIZE=$((1 << 12))
 
+# If HOSTNAME isn't set by this shell, we'll do it
+[ -n "$HOSTNAME" ] || HOSTNAME=$(uname -n)
+
 # Don't warn me about new mail
 unset -v MAILCHECK