diff --git a/Formula/monetdb.rb b/Formula/monetdb.rb
index 08c01a426d..5dc7422c37 100644
--- a/Formula/monetdb.rb
+++ b/Formula/monetdb.rb
@@ -16,8 +16,8 @@ end
 class Monetdb < Formula
   desc "Column-store database"
   homepage "https://www.monetdb.org/"
-  url "https://dev.monetdb.org/downloads/sources/Oct2014-SP4/MonetDB-11.19.15.zip"
-  sha256 "bb32560bd66496581416abcf8f84dfe13616f405092f9ee570e1411534af635c"
+  url "https://dev.monetdb.org/downloads/sources/Jul2015/MonetDB-11.21.5.zip"
+  sha256 "ed9f40a68a8a9af0723cde6380492cae28082c900eae06cc4d3266c15fe540ea"
 
   bottle do
     sha256 "41605243b56eb90d354d970de4815f09e79f0920494e1a698457c69877018ac1" => :yosemite
@@ -34,7 +34,8 @@ class Monetdb < Formula
     depends_on "autoconf" => :build
   end
 
-  option "with-java", "Build the JDBC dirver"
+  option "with-java", "Build the JDBC driver"
+  option "with-ruby", "Build the Ruby driver"
   option "with-r", "Build the R integration module"
 
   depends_on RRequirement => :optional
@@ -61,10 +62,10 @@ class Monetdb < Formula
             "--enable-assert=no",
             "--enable-optimize=yes",
             "--enable-testing=no",
-            "--with-readline=#{Formula["readline"].opt_prefix}", # Use the correct readline
-            "--without-rubygem"] # Installing the RubyGems requires root permissions
+            "--with-readline=#{Formula["readline"].opt_prefix}"]
 
     args << "--with-java=no" if build.without? "java"
+    args << "--with-rubygem=no" if build.without? "ruby"
     args << "--disable-rintegration" if build.without? "r"
 
     system "./configure", *args