3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69f2facd6d..deb98e448e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 22 18:10:35 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
 Thu Jan 22 17:30:33 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index acd7e654d4..e553b629ec 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2742,7 +2742,7 @@ End
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary
diff --git a/version.h b/version.h
index 059388b0a0..42b703ce35 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 615
+#define RUBY_PATCHLEVEL 616
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1