diff --git a/.gitmodules b/.gitmodules
index 293c89ff..77bbb5cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,3 +26,6 @@
 	path = .vim/bundle/vim-colors-solarized
     url = git@github.com:cyplo/vim-colors-solarized.git
 
+[submodule ".oh-my-zsh"]
+	path = .oh-my-zsh
+	url = git://github.com/robbyrussell/oh-my-zsh.git
diff --git a/.oh-my-zsh b/.oh-my-zsh
new file mode 160000
index 00000000..66a33b80
--- /dev/null
+++ b/.oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 66a33b80c3c5c768bab0fd4bbed37851fcc01675
diff --git a/.zshrc b/.zshrc
index b5430fb9..e22e0ed3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,3 +1,50 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="gentoo"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Uncomment this to disable bi-weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment to change how often before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want to disable command autocorrection
+# DISABLE_CORRECTION="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment following line if you want to disable marking untracked files under
+# VCS as dirty. This makes repository status check for large repositories much,
+# much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...
 HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
@@ -11,19 +58,7 @@ autoload -U compinit
 compinit
 setopt completealiases
 
-autoload -U  promptinit
-promptinit
-
-#default, should be everywhere
-prompt redhat
-
-#use 'gentoo' prompt if available
-prompt -l | grep -i gentoo > /dev/null
-code=$?
-if [[ $code == 0 ]]; then
-    prompt gentoo
-    zstyle ':completion::complete:*' use-cache 1
-fi
+zstyle ':completion::complete:*' use-cache 1
 
 if [[ `uname` == 'Darwin' ]]; then
 	alias vim=/usr/local/Cellar/vim/7.4/bin/vim