diff --git a/ChangeLog b/ChangeLog
index f800dd7633..ae42d3bf15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 11 11:52:39 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems: Update to RubyGems 2.5.1
+	* test/rubygems: ditto.
+
 Fri Dec 11 11:38:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_compile_each, ibf_load_object_hash): rehash
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 5ee82c2397..f0861b3533 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -9,7 +9,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
diff --git a/lib/rubygems/commands/list_command.rb b/lib/rubygems/commands/list_command.rb
index 1842aaacca..6aa00d30b8 100644
--- a/lib/rubygems/commands/list_command.rb
+++ b/lib/rubygems/commands/list_command.rb
@@ -3,7 +3,7 @@ require 'rubygems/commands/query_command'
 
 ##
 # An alternate to Gem::Commands::QueryCommand that searches for gems starting
-# with the the supplied argument.
+# with the supplied argument.
 
 class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
 
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index e2ee59a0c2..16e20c5246 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -107,7 +107,7 @@
 # Client A needs a stack with basic push/pop capability.  They write to the
 # original interface (no <tt>top</tt>), so their version constraint looks like:
 #
-#   gem 'stack', '~> 0.0'
+#   gem 'stack', '>= 0.0'
 #
 # Essentially, any version is OK with Client A.  An incompatible change to
 # the library will cause them grief, but they are willing to take the chance
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index 711cd1b8f2..9b2b978af1 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -52,8 +52,8 @@ class TestBundledCA < Gem::TestCase
     assert_https('d2chzxaqi4y7f8.cloudfront.net')
   end
 
-  def test_accessing_s3
-    assert_https('s3.amazonaws.com')
+  def test_accessing_fastly
+    assert_https('rubygems.global.ssl.fastly.net')
   end
 
 end if ENV['TRAVIS']