diff --git a/.zshrc b/.zshrc
index 0a4f6c86..7585f867 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,7 +8,6 @@ plugins=(vi-mode svn git python history-substring-search)
 
 source $ZSH/oh-my-zsh.sh
 
-# Customize to your needs...
 HISTFILE=~/.histfile
 HISTSIZE=10240
 SAVEHIST=10240
@@ -21,6 +20,13 @@ setopt completealiases
 
 zstyle ':completion::complete:*' use-cache 1
 
+# bind UP and DOWN arrow keys
+zmodload zsh/terminfo
+bindkey "$terminfo[cuu1]" history-substring-search-up
+bindkey "$terminfo[cud1]" history-substring-search-down
+bindkey -M vicmd 'k' history-substring-search-up
+bindkey -M vicmd 'j' history-substring-search-down
+
 if [[ `uname` == 'Darwin' ]]; then
 	alias vim=/usr/local/Cellar/vim/7.4/bin/vim
 fi