diff --git a/ChangeLog b/ChangeLog
index 88c179648f..685eb9e318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 28 23:10:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
+	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
+
 Thu Mar 28 18:22:21 2013  Tanaka Akira  <akr@fsij.org>
 
 	* test/-ext-/num2int/test_num2int.rb: extract
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 07be55c46c..f341befefe 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -29,7 +29,15 @@ extern "C" {
 
 #include "ruby/config.h"
 #if defined(HAVE_POLL)
+#  ifdef _AIX
+#    define reqevents events
+#    define rtnevents revents
+#  endif
 #  include <poll.h>
+#  ifdef _AIX
+#    undef reqevents
+#    undef rtnevents
+#  endif
 #  define RB_WAITFD_IN  POLLIN
 #  define RB_WAITFD_PRI POLLPRI
 #  define RB_WAITFD_OUT POLLOUT