diff --git a/bash/prompt b/bash/prompt
index 5a22a6e..30d934a 100644
--- a/bash/prompt
+++ b/bash/prompt
@@ -57,8 +57,17 @@ set_prompt() {
 
     local buffer=""
 
+    local hostname=""
+    if [[ -n $HOST ]]; then
+        hostname="${HOST%.local}"
+    elif [[ -n $HOSTNAME ]]; then
+        hostname="${HOSTNAME}"
+    else
+        hostname="$(hostname -s)"
+    fi
+
     if [[ -n $SSH_CLIENT ]]; then
-        buffer="${buffer}${HOST%.local} "
+        buffer="${buffer}${hostname} "
     fi
 
     if [[ -n $STY ]]; then
diff --git a/zsh/prompt b/zsh/prompt
index 1a9f56b..804ecce 100644
--- a/zsh/prompt
+++ b/zsh/prompt
@@ -131,8 +131,17 @@ set_prompt() {
 
     local buffer=""
 
+    local hostname=""
+    if [[ -n $HOST ]]; then
+        hostname="${HOST%.local}"
+    elif [[ -n $HOSTNAME ]]; then
+        hostname="${HOSTNAME}"
+    else
+        hostname="$(hostname -s)"
+    fi
+
     if [[ -n $SSH_CLIENT ]]; then
-        buffer="${buffer}${HOST%.local} "
+        buffer="${buffer}${hostname} "
     fi
 
     if [[ -n $STY ]]; then