diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index f9d4ff9fb6997c71b429293803c1b60ad76d686f..53352423575fbf8280cbfec5a77a1c21153177ae 100755
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -65,18 +65,32 @@ echo "Installed git-core.."
 # Setting up ruby gems
 echo "Fetching and installing ruby gems.."
 (
-    echo "."
-    cd /tmp 
-    wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-    echo "."
-    tar -xf rubygems-1.3.7.tgz
-    echo "."
-    cd rubygems-1.3.7
-    echo "."
-    sudo ruby setup.rb
-    echo "."
-    sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
-    echo "."    
+    RELEASE=$(lsb_release -c | cut -f2)
+    if [ RELEASE == "maverick" ]
+	then
+    	sudo apt-get install --no-install-recommends -y rubygems
+		sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+	elsif [ RELEASE == "lucid" ]
+    then
+        sudo add-apt-repository ppa:maco.m/ruby
+        sudo apt-get update
+    	sudo apt-get install --no-install-recommends -y rubygems
+		sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+	else
+		# Old version
+		echo "."
+		cd /tmp 
+		wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+		echo "."
+		tar -xf rubygems-1.3.7.tgz
+		echo "."
+		cd rubygems-1.3.7
+		echo "."
+		sudo ruby setup.rb
+		echo "."
+		sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
+		echo "."    
+    fi  
 ) 
 echo "Done installing the gems.."