diff --git a/ChangeLog b/ChangeLog
index 34ac232fda..3dfb946e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 26 08:49:28 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/rubygems/test_gem_remote_fetcher.rb: backport rubygems upstream
+	  change for OpenSSL key length. see detail to
+	  https://github.com/rubygems/rubygems/pull/1290
+
 Sun Jul 26 08:33:03 2015  Aaron Patterson <tenderlove@ruby-lang.org>
 
 	* ext/openssl/lib/openssl/pkey.rb: implement DEFAULT_512 and
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 63dd8feb38..0d2632e99a 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -898,7 +898,7 @@ gems:
       server.mount_proc("/insecure_redirect") { |req, res|
         res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, req.query['to'])
       }
-      server.ssl_context.tmp_dh_callback = proc {|_, _, k| OpenSSL::PKey::DH.new(k) }
+      server.ssl_context.tmp_dh_callback = proc { OpenSSL::PKey::DH.new 2048 }
       t = Thread.new do
         begin
           server.start
@@ -984,4 +984,3 @@ gems:
   end
 
 end
-