1 files changed, 9 insertions, 4 deletions
diff --git a/bin/gem b/bin/gem
index aa8db57b51..b5b2b63809 100755
--- a/bin/gem
+++ b/bin/gem
@@ -7,11 +7,12 @@
 
 require 'rubygems'
 require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
 
-required_version = Gem::Requirement.new ">= 1.8.3"
+required_version = Gem::Requirement.new "> 1.8.3"
 
-unless required_version.satisfied_by? Gem::Version.new(RUBY_VERSION) then
-  abort "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
 end
 
 # We need to preserve the original ARGV to use for passing gem options
@@ -19,5 +20,9 @@ end
 # it...its for the source building process.
 args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
 
-Gem::GemRunner.new.run args
+begin
+  Gem::GemRunner.new.run args
+rescue Gem::SystemExitException => e
+  exit e.exit_code
+end