diff --git a/Formula/gmp.rb b/Formula/gmp.rb
index 35c7d7c725e..e2abfe3f63b 100644
--- a/Formula/gmp.rb
+++ b/Formula/gmp.rb
@@ -2,9 +2,9 @@ require 'formula'
 
 class Gmp < Formula
   homepage 'http://gmplib.org/'
-  url 'http://ftpmirror.gnu.org/gmp/gmp-5.0.4.tar.bz2'
-  mirror 'http://ftp.gnu.org/gnu/gmp/gmp-5.0.4.tar.bz2'
-  sha1 'ea4ea7c3f10436ef5ae7a75b3fad163a8b86edc0'
+  url 'http://ftpmirror.gnu.org/gmp/gmp-5.0.5.tar.bz2'
+  mirror 'http://ftp.gnu.org/gnu/gmp/gmp-5.0.5.tar.bz2'
+  sha256 '1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9'
 
   def options
     [
@@ -18,11 +18,10 @@ class Gmp < Formula
     # https://github.com/mxcl/homebrew/issues/issue/2302
     # Also force use of 4.2 on 10.6 in case a user has changed the default
     # Do not force if xcode > 4.2 since it does not have /usr/bin/gcc-4.2 as default
-    unless MacOS.xcode_version >= "4.2"
-      ENV.gcc_4_2
-    end
+    # FIXME convert this to appropriate fails_with annotations
+    ENV.gcc unless MacOS.xcode_version.to_f >= 4.2
 
-    args = ["--prefix=#{prefix}", "--enable-cxx"]
+    args = %W[--prefix=#{prefix} --enable-cxx]
 
     # Build 32-bit where appropriate, and help configure find 64-bit CPUs
     # see: http://gmplib.org/macos.html
@@ -37,10 +36,8 @@ class Gmp < Formula
     system "./configure", *args
     system "make"
     ENV.j1 # Doesn't install in parallel on 8-core Mac Pro
-    system "make install"
-
-    # Different compilers and options can cause tests to fail even
-    # if everything compiles, so yes, we want to do this step.
+    # Upstream implores users to always run the test suite
     system "make check" unless ARGV.include? "--skip-check"
+    system "make install"
   end
 end