diff --git a/lib/functions.zsh b/lib/functions.zsh
index 17f5f9cbf..7376d0fc2 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -3,7 +3,7 @@ function zsh_stats() {
 }
 
 function uninstall_oh_my_zsh() {
-  env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
+  env ZSH=$ZSH SHORT_HOST=$SHORT_HOST zsh $ZSH/tools/uninstall.zsh
 }
 
 function upgrade_oh_my_zsh() {
diff --git a/tools/install.sh b/tools/install.sh
index bd4c55749..8d742c0fd 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -46,5 +46,5 @@ echo "\033[0;32m"'                        /____/                       ....is no
 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
+
 env zsh
-. ~/.zshrc
diff --git a/tools/uninstall.sh b/tools/uninstall.zsh
similarity index 61%
rename from tools/uninstall.sh
rename to tools/uninstall.zsh
index 41d601576..27575316d 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.zsh
@@ -1,16 +1,23 @@
-echo "Removing ~/.oh-my-zsh"
-if [[ -d ~/.oh-my-zsh ]]
-then
-  rm -rf ~/.oh-my-zsh
+#!/usr/bin/env zsh
+
+echo "Removing $ZSH"
+if [[ -d $ZSH ]]; then
+  rm -rf $ZSH
 fi
 
+echo "Removing Oh My Zsh data files"
+if [[ -z $SHORT_HOST ]]; then
+  SHORT_HOST=${HOST/.*/}
+fi
+setopt null_glob
+rm -fv ~/.zsh-update ${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-*
+
+
 echo "Looking for original zsh config..."
-if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
-then
+if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]; then
   echo "Found ~/.zshrc.pre-oh-my-zsh -- Restoring to ~/.zshrc";
 
-  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
-  then
+  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
     ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`";
     echo "Found ~/.zshrc -- Renaming to ~/${ZSHRC_SAVE}";
     mv ~/.zshrc ~/${ZSHRC_SAVE};
@@ -18,11 +25,9 @@ then
 
   mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
 
-  source ~/.zshrc;
 else
   echo "Switching back to bash"
   chsh -s /bin/bash
-  source /etc/profile
 fi
 
 echo "Thanks for trying out Oh My Zsh. It's been uninstalled."