diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c217b91bb..a5afdfffa 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -37,13 +37,7 @@ for plugin ($plugins); do
   fi
 done
 
-# Figure out the SHORT hostname
-if [ -n "$commands[scutil]" ]; then
-  # OS X
-  SHORT_HOST=$(scutil --get ComputerName)
-else
-  SHORT_HOST=${HOST/.*/}
-fi
+SHORT_HOST=$(hostname -s)
 
 # Save the location of the current completion dump file.
 if [ -z "$ZSH_COMPDUMP" ]; then