diff --git a/ChangeLog b/ChangeLog
index 5ce5fdcffb..36507d10f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+Mon Apr 23 20:11:02 2012  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
+	  OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512.
+	  http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest
+	  reported by Bohuslav Kabrda.
+	  [ruby-core:43844] [ruby-trunk - Bug #6221]
+
 Mon Apr 23 19:54:33 2012  Tanaka Akira  <akr@fsij.org>
 
 	* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
-	  [ruby-dev:45551] reported by NARUSE, Yui.
+	  reported by NARUSE, Yui.  [ruby-dev:45551]
 
 Mon Apr 23 14:16:45 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index ebd648b256..2b6a2376ef 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -54,7 +54,7 @@ module DRb
           return
         end
 
-        rsa = OpenSSL::PKey::RSA.new(512){|p, n|
+        rsa = OpenSSL::PKey::RSA.new(1024){|p, n|
           next unless self[:verbose]
           case p
           when 0; $stderr.putc "."  # BN_generate_prime