diff --git a/.zshrc b/.zshrc
index d5eba57f..860a8d40 100644
--- a/.zshrc
+++ b/.zshrc
@@ -51,3 +51,5 @@ alias benice="ionice -c3 nice -n20"
 source ~/.setenv
 
 
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index c79dd2d1..fc818a8c 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -99,6 +99,11 @@ if [[ -z $NORUST ]]; then
     cargo install -f rustfmt
 fi
 
+if [[ -z $NORUBY ]]; then
+    gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+    curl -sSL https://get.rvm.io | bash -s stable --ruby
+fi
+
 if [[ -z $NOVIM ]]; then
     echo "\n" | vim +PluginInstall +qa
     cd "$DIR/.vim/bundle/YouCompleteMe/"
diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat
index 6da99688..6f5f5163 100755
--- a/windows_cygwin/build.bat
+++ b/windows_cygwin/build.bat
@@ -1,5 +1,5 @@
 @echo on
-choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5
+choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby ruby2.devkit 
 
 wget -c https://cygwin.com/setup-x86_64.exe
 setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang
diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh
index 67e2ac84..7dadc6bd 100755
--- a/windows_cygwin/build_insider.sh
+++ b/windows_cygwin/build_insider.sh
@@ -12,6 +12,7 @@ git checkout $branch
 export NOSUDO=true
 export DONT_CHANGE_SHELL=true
 export NORUST=true
+export NORUBY=true
 export NOVIM=true
 export NO_GO=true
 export DIR=$DOTFILES_PATH