diff --git a/ChangeLog b/ChangeLog
index 0f92208c79..fbd4cf6627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 29 22:40:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/maintainers.rdoc (ext/io/nonblock): still maintained, as
+	  well as ext/io/wait, which is the origin.
+
 Fri Apr 29 21:18:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* doc/maintainers.rdoc (ext/win32): of course, it's still maintained.
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index 872d9c7b8b..675e9ea2b7 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -210,7 +210,7 @@ Zachary Scott (zzak)
 [ext/io/console]
   Nobuyuki Nakada (nobu)
 [ext/io/nonblock]
-  _unmaintained_
+  Nobuyuki Nakada (nobu)
 [ext/io/wait]
   Nobuyuki Nakada (nobu)
 [ext/json]