diff --git a/zsh/lib/functions.zsh b/zsh/lib/functions.zsh
index 3a2305d..e15683b 100644
--- a/zsh/lib/functions.zsh
+++ b/zsh/lib/functions.zsh
@@ -61,3 +61,13 @@ function extract() {
   fi
 }
 
+function ruby_version()
+{
+    if which rvm-prompt &> /dev/null; then
+      rvm-prompt i v g
+    else
+      if which rbenv &> /dev/null; then
+        rbenv version | sed -e "s/ (set.*$//"
+      fi
+    fi
+}
diff --git a/zsh/lib/promt.zsh b/zsh/lib/promt.zsh
index 3935ce2..cdb75ca 100644
--- a/zsh/lib/promt.zsh
+++ b/zsh/lib/promt.zsh
@@ -15,10 +15,12 @@ $(virtualenv_info)$(prompt_char) '
 #RPROMPT='[%T]'
 
 #RVM settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then
-    RPROMPT='[%T] %{$fg[yellow]%}rvm: %{$reset_color%}%{$fg[red]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%}'
-  else
-    RPROMPT='[%T]'
+if which rvm-prompt &> /dev/null; then
+  RPROMPT='[%T] %{$fg[yellow]%}rvm: %{$reset_color%}%{$fg[red]%}$(ruby_version)%{$reset_color%}'
+elif which rbenv &> /dev/null; then
+  RPROMPT='[%T] %{$fg[yellow]%}rbenv: %{$reset_color%}%{$fg[red]%}$(ruby_version)%{$reset_color%}'
+else
+  RPROMPT='[%T]'
 fi
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[yellow]%}"
diff --git a/zshrc b/zshrc
index f94ff17..9d6940f 100644
--- a/zshrc
+++ b/zshrc
@@ -12,6 +12,10 @@ ulimit -Sn 2048
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
 
+# rbenv
+export RBENV_ROOT=/usr/local/var/rbenv
+eval "$(rbenv init -)"
+
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
 PATH=/usr/local/bin:$PATH
 PATH=/usr/local/bin:/usr/local/sbin:$PATH # Added for more brew executables