diff --git a/zsh/.config/zsh/01_exports.zsh b/zsh/.config/zsh/01_exports.zsh
index 1d2970a..6096e72 100644
--- a/zsh/.config/zsh/01_exports.zsh
+++ b/zsh/.config/zsh/01_exports.zsh
@@ -1,5 +1,6 @@
 # History
-HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
+mkdir -p "${XDG_STATE_HOME}/zsh"
+HISTFILE="${XDG_STATE_HOME}/zsh/history"
 HISTSIZE=2000
 SAVEHIST=1000
 
diff --git a/zsh/.config/zsh/10_completions.zsh b/zsh/.config/zsh/10_completions.zsh
index 9d2d2ff..28bf88f 100644
--- a/zsh/.config/zsh/10_completions.zsh
+++ b/zsh/.config/zsh/10_completions.zsh
@@ -1,4 +1,4 @@
-fpath+=($HOME/.config/zsh/completions)
+fpath+=($XDG_CONFIG_HOME/zsh/completions)
 
 autoload -Uz compinit
-compinit
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"