diff --git a/Library/Formula/groonga.rb b/Library/Formula/groonga.rb
index bbf5115c0eba..5f84c72e90c6 100644
--- a/Library/Formula/groonga.rb
+++ b/Library/Formula/groonga.rb
@@ -1,8 +1,8 @@
 class Groonga < Formula
   desc "Fulltext search engine and column store"
   homepage "http://groonga.org/"
-  url "http://packages.groonga.org/source/groonga/groonga-5.0.4.tar.gz"
-  sha256 "338b7a921e6f6dcf3e65d2147a55a9fe646544eeb97653194261111159b4fe10"
+  url "http://packages.groonga.org/source/groonga/groonga-5.0.5.tar.gz"
+  sha256 "ca62d15374117f4007a7b406ac2072683edda7ed7607d1b1fbcf3a30920f5b56"
 
   bottle do
     sha256 "73dd96e27fcc896f7625fb834f4869ed515c97a41213ceb06c35c379e45a2bfc" => :yosemite
@@ -10,6 +10,8 @@ class Groonga < Formula
     sha256 "5d7041fac2246ffda0a056e86a03a8e49eef6617f06dfda6ee1c1e709bb9c09c" => :mountain_lion
   end
 
+  option "with-benchmark", "With benchmark program for developer use"
+
   depends_on "pkg-config" => :build
   depends_on "pcre"
   depends_on "msgpack"
@@ -18,9 +20,9 @@ class Groonga < Formula
   depends_on "lz4" => :optional
   depends_on "openssl"
 
-  depends_on "glib" if build.include? "enable-benchmark"
+  depends_on "glib" if build.with? "benchmark"
 
-  option "enable-benchmark", "Enable benchmark program for developer use"
+  deprecated_option "enable-benchmark" => "with-benchmark"
 
   def install
     args = %W[
@@ -37,7 +39,11 @@ def install
 
     # ZeroMQ is an optional dependency that will be auto-detected unless we disable it
     system "./configure", *args
-    system "make"
-    system "make install"
+    system "make", "install"
+  end
+
+  test do
+    output = shell_output("groonga --version")
+    assert_match /groonga #{version}/, output
   end
 end