diff --git a/ChangeLog b/ChangeLog
index 9f786630fe..c5095c9767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 15 02:26:34 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP#connect): use connect_nonblock and
+	  io/wait to eliminate timeout use. fix GH-899
+
 Sat Jun 13 07:21:18 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* thread.c (thread_start_func_2): don't interrupt when last thread
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 4c1c3271ae..4db69b623b 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -925,7 +925,21 @@ module Net   #:nodoc:
           end
           # Server Name Indication (SNI) RFC 3546
           s.hostname = @address if s.respond_to? :hostname=
-          Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect }
+          if timeout = @open_timeout
+            while true
+              raise Net::OpenTimeout if timeout <= 0
+              start = Process.clock_gettime Process::CLOCK_MONOTONIC
+              # to_io is requied because SSLSocket doesn't have wait_readable yet
+              case s.connect_nonblock(exception: false)
+              when :wait_readable; s.to_io.wait_readable(timeout)
+              when :wait_writable; s.to_io.wait_writable(timeout)
+              else; break
+              end
+              timeout -= Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+            end
+          else
+            s.connect
+          end
           if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
             s.post_connection_check(@address)
           end