diff --git a/shell/env.sh b/shell/env.sh
index 3ec61cf..f75da8e 100644
--- a/shell/env.sh
+++ b/shell/env.sh
@@ -13,6 +13,11 @@ export LANG="en_US.UTF-8"
 # GCC 4.2 via Homebrew
 # export CC=/usr/local/bin/gcc-4.2
 
+# Support /opt install of zsh
+if [ -d "/opt/zsh/bin" ]; then
+  path_prepend "/opt/zsh/bin"
+fi
+
 # Android SDK
 export ANDROID_SDK_ROOT="/usr/local/Cellar/android-sdk/r20.0.1"
 export ANDROID_HOME="/usr/local/opt/android-sdk"
diff --git a/shell/ruby.sh b/shell/ruby.sh
index 90b6308..e8984b0 100755
--- a/shell/ruby.sh
+++ b/shell/ruby.sh
@@ -51,6 +51,7 @@ if [ -d "$HOME/.rbenv/bin" ]; then
   eval "$(rbenv init -)"
   # fi
 elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
+  path_append "$HOME/.rvm/bin"
   source "$HOME/.rvm/scripts/rvm"
 fi