diff --git a/ChangeLog b/ChangeLog
index 4693463b4e..ba6ab176ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  8 01:31:27 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#initialize):
+	  default value of Net::HTTP#open_timeout is now 60 (was nil).
+
 Sat Nov  7 12:18:05 2015  Eric Wong  <e@80x24.org>
 
 	* string.c (id_to_s): remove redundant variable
diff --git a/NEWS b/NEWS
index cd3b548625..2d7c8b3313 100644
--- a/NEWS
+++ b/NEWS
@@ -185,6 +185,9 @@ with all sufficient information, see the ChangeLog file.
   * Coverage.peek_result: new method to allow coverage to be captured without
     stopping the coverage tool.
 
+* Net::HTTP
+  * default value of Net::HTTP#open_timeout is now 60 (was nil).
+
 * Net::Telnet
   * Net::Telnet is extracted to net-telnet gem. It's unmaintain code.
 
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 0ec93752ce..1021258128 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -641,7 +641,7 @@ module Net   #:nodoc:
       @close_on_empty_response = false
       @socket  = nil
       @started = false
-      @open_timeout = nil
+      @open_timeout = 60
       @read_timeout = 60
       @continue_timeout = nil
       @debug_output = nil