diff --git a/zsh/aliases b/zsh/aliases
new file mode 100644
index 00000000..acacd716
--- /dev/null
+++ b/zsh/aliases
@@ -0,0 +1,32 @@
+#######################
+# Aliases
+
+alias ll='ls -l'
+alias la='ls -la'
+
+alias zrc='vim ~/.zshrc'
+
+# Directories
+alias dev='cd /usr/local/dev'
+alias w='cd ~/Work/'
+alias wd='cd ~/Work/Dev'
+alias wp='cd ~/Work/Projects/'
+
+# Vim
+alias v='mvim'
+
+# Git
+alias g='git'
+alias ga='g a'
+alias gap='g a -p'
+alias gc='g c'
+alias gs='g s'
+alias gd='g d'
+
+# Laravel (provided in zsh plugin)
+# alias artisan='php artisan'
+# alias bob='php artisan bob::build'
+
+function quick-look() {
+  (( $# > 0 )) && qlmanage -p $* &>/dev/null &
+}
diff --git a/zsh/completion b/zsh/completion
new file mode 100644
index 00000000..aaf057ac
--- /dev/null
+++ b/zsh/completion
@@ -0,0 +1,3 @@
+
+# Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards
+[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2)" scp sftp ssh
diff --git a/zsh/config b/zsh/config
new file mode 100644
index 00000000..ba950c04
--- /dev/null
+++ b/zsh/config
@@ -0,0 +1,25 @@
+ 
+# HISTORY
+HISTFILE=~/.histfile
+HISTSIZE=10000
+SAVEHIST=10000
+setopt share_history
+setopt hist_ignore_dups
+setopt hist_ignore_space
+setopt extended_history
+setopt no_beep
+setopt extendedglob
+setopt prompt_subst
+setopt complete_in_word
+setopt no_auto_menu
+setopt no_always_last_prompt
+setopt promptsubst
+setopt autopushd
+setopt pushdignoredups
+
+export EDITOR='vim'
+export RUBYOPT=rubygems
+export CPPFLAGS=-I/opt/X11/include
+# export CC=gcc-4.2
+
+COMPLETION_WAITING_DOTS="true"
diff --git a/zsh/paths b/zsh/paths
new file mode 100644
index 00000000..70e4b599
--- /dev/null
+++ b/zsh/paths
@@ -0,0 +1,18 @@
+
+if [ -d ~/Dropbox ]; then
+    PATH=$PATH:~/Dropbox/dev/bin
+fi
+
+if [ "`command -v brew 2>&1`" ]; then
+    BREWDIR=`brew --prefix`
+
+    PATH=$PATH:$BREWDIR/bin
+    PATH=$PATH:$BREWDIR/sbin
+
+    COREUTIL=`brew --prefix coreutils`
+    if [ -d "$COREUTIL" ]; then
+        PATH=$PATH:`brew --prefix coreutils`
+    fi
+fi
+
+PATH=$PATH:$HOME/.rvm/bin
diff --git a/zsh/prompt b/zsh/prompt
new file mode 100644
index 00000000..0d91d17e
--- /dev/null
+++ b/zsh/prompt
@@ -0,0 +1,7 @@
+
+PROMPT="
+%{$FX[bold]%}%{$fg[cyan]%}%{$BG[234]%}> "
+RPROMPT="%~$(git_prompt_info) @ %{$fg[white]%}$(hostname)%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]"
diff --git a/zsh/welcome b/zsh/welcome
new file mode 100644
index 00000000..30fd8e18
--- /dev/null
+++ b/zsh/welcome
@@ -0,0 +1 @@
+# Nothing here yet