diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 6b437900ca1..b32b3d4fb04 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -4,15 +4,26 @@
   , openssl ? null
 }:
 
-stdenv.mkDerivation {
-  name = "ruby-1.8.6";
+stdenv.mkDerivation rec {
+  version = "1.8.7-p22";
+  name = "ruby-${version}";
   src = fetchurl {
-    url = ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.6.tar.gz;
-    md5 = "23d2494aa94e7ae1ecbbb8c5e1507683";
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/${name}.tar.gz";
+    sha256 = "0wn04bzmgmn2bvpwjh3b403dp3iqiygd75s76136h1khy6lydr6j";
   };
 
   buildInputs = [ncurses readline]
     ++(lib.optional (zlib != null) zlib)
     ++(lib.optional (openssl != null) openssl)
   ;
+  configureFlags = ["--enable-shared" "--enable-pthread"] ;
+
+
+  # NIX_LDFLAGS = "-lpthread -lutil";
+
+  meta = {
+    license = "Ruby";
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix
index 49702be7e40..f53d8aa5f36 100644
--- a/pkgs/development/interpreters/ruby/gems.nix
+++ b/pkgs/development/interpreters/ruby/gems.nix
@@ -1,10 +1,10 @@
 args : with args; 
 rec {
+  version = "1.2.0";
   src = fetchurl {
-    url = http://rubyforge.org/frs/download.php/35283/rubygems-1.1.1.tgz;
-    sha256 = "1qb4crmx1dihmk1am93ly437480jvp7lh4pbiwy5ir19hqnfh71b";
+    url = "http://rubyforge.org/frs/download.php/38646/rubygems-${version}.tgz";
+    sha256 = "0b9ppgs9av4z344s13wp40ki72prxyz3q0hmsf5swx7xhl54bbr8";
   };
-  version = "1.1.1";
 
   buildInputs = [ruby makeWrapper];
   configureFlags = [];
@@ -19,6 +19,6 @@ rec {
       
   name = "rubygems-" + version;
   meta = {
-    description = "Ruby package collection";
+    description = "Ruby gems package collection";
   };
 }