diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 15c1dce44..3e67b305b 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -38,13 +38,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.
 ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"