diff --git a/dotfiles/system/etc/zsh/zshrc b/dotfiles/system/etc/zsh/zshrc
index 491d426..9b63cd7 100644
--- a/dotfiles/system/etc/zsh/zshrc
+++ b/dotfiles/system/etc/zsh/zshrc
@@ -117,17 +117,21 @@ swap-files() {
 
 # history including search
 HISTFILE=~/.history
-SAVEHIST=5000
-HISTSIZE=5000
-setopt HIST_IGNORE_SPACE
-setopt HIST_IGNORE_ALL_DUPS
-setopt INC_APPEND_HISTORY
-autoload -U up-line-or-beginning-search
-autoload -U down-line-or-beginning-search
-zle -N up-line-or-beginning-search
-zle -N down-line-or-beginning-search
-bindkey "^[[A" up-line-or-beginning-search # Up
-bindkey "^[[B" down-line-or-beginning-search # Down
+HISTSIZE=10000000
+SAVEHIST=10000000
+setopt EXTENDED_HISTORY          # Write the history file in the ":start:elapsed;command" format.
+setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
+setopt SHARE_HISTORY             # Share history between all sessions.
+setopt HIST_EXPIRE_DUPS_FIRST    # Expire duplicate entries first when trimming history.
+setopt HIST_IGNORE_DUPS          # Don't record an entry that was just recorded again.
+setopt HIST_IGNORE_ALL_DUPS      # Delete old recorded entry if new entry is a duplicate.
+setopt HIST_FIND_NO_DUPS         # Do not display a line previously found.
+setopt HIST_IGNORE_SPACE         # Don't record an entry starting with a space.
+setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history file.
+setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
+setopt HIST_VERIFY               # Don't execute immediately upon history expansion.
+bindkey '\e[A' history-beginning-search-backward # completion from history with Up/Down keys
+bindkey '\e[B' history-beginning-search-forward  #
 
 setopt EXTENDED_GLOB
 unsetopt NO_CLOBBER # prevents cat < file > file