diff --git a/zsh/completion b/zsh/completion
index 5ee5aa5..6c3e0b8 100755
--- a/zsh/completion
+++ b/zsh/completion
@@ -26,7 +26,7 @@ zstyle -e ':completion:*' users "reply=( root '${USERNAME}' )"
 
 # caching good
 zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path "${HOME}/.zsh/.zcompcache-${HOST}"
+zstyle ':completion:*' cache-path "${HOME}/.zsh/.zcompcache-${LHOSTNAME}"
 
 # descriptions
 zstyle ':completion:*:messages' format $'%{\e[01;35m%} -- %d -- %{\e[00;00m%}'
diff --git a/zshrc b/zshrc
index 637aad4..f120a9c 100644
--- a/zshrc
+++ b/zshrc
@@ -3,7 +3,16 @@
 # Trivial modifications: David Majnemer
 # vim:set nowrap:
 
-autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump-${HOST}"
+case `uname -s` in
+	Darwin)
+		export LHOSTNAME=`scutil --get LocalHostName`
+	;;
+	*)
+		export LHOSTNAME=${HOST}
+	;;
+esac
+
+autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump-${LHOSTNAME}"
 
 autoload age
 autoload zmv