diff --git a/man2/epoll_create.2 b/man2/epoll_create.2
index e6ece72fd..f1172cd90 100644
--- a/man2/epoll_create.2
+++ b/man2/epoll_create.2
@@ -19,6 +19,7 @@
 .\"  Davide Libenzi <davidel@xmailserver.org>
 .\"
 .\" Modified 2004-06-17 by Michael Kerrisk <mtk-manpages@gmx.net>
+.\" Modified 2005-04-04 by Marko Kohtala <marko.kohtala@gmail.com>
 .\"
 .TH EPOLL_CREATE 2 "2004-06-17" "Linux 2.6.7" "Linux Programmer's Manual"
 .SH NAME
@@ -54,6 +55,11 @@ returns -1 and
 is set appropriately.
 .SH ERRORS
 .TP
+.B EINVAL
+.I size
+is not positive.
+.TP
+.TP
 .B ENFILE
 The system limit on the total number of open files has been reached.
 .TP
diff --git a/man2/epoll_ctl.2 b/man2/epoll_ctl.2
index 5eed4b748..8c219c5c6 100644
--- a/man2/epoll_ctl.2
+++ b/man2/epoll_ctl.2
@@ -81,9 +81,15 @@ operations.
 .TP
 .B EPOLLERR
 Error condition happened on the associated file descriptor.
+.BR epoll_wait (2)
+will always wait for this event; it is not necessary to set it in
+.IR events .
 .TP
 .B EPOLLHUP
 Hang up happened on the associated file descriptor.
+.BR epoll_wait (2)
+will always wait for this event; it is not necessary to set it in
+.IR events .
 .TP
 .B EPOLLET
 Sets the Edge Triggered behaviour for the associated file descriptor.
@@ -154,19 +160,36 @@ is set appropriately.
 .SH ERRORS
 .TP
 .B EBADF
-The
 .I epfd
-file descriptor is not a valid file descriptor.
+is not a valid file descriptor.
+.TP
+.B EEXIST
+.I op
+was EPOLL_CTL_ADD, and the supplied file descriptor
+.IR fd
+is already in
+.IR epfd .
 .TP
 .B EINVAL
-The supplied file descriptor,
-.IR epfd ,
+.IR epfd 
 is not an
 .B epoll
-file descriptor, or the requested operation
+file descriptor,
+or
+.IR fd 
+is the same as
+.IR epfd ,
+or the requested operation
 .I op
 is not supported by this interface.
 .TP
+.B ENOENT
+.I op
+was EPOLL_CTL_MOD or EPOLL_CTL_DEL, and
+.IR fd
+is not in
+.IR epfd .
+.TP
 .B ENOMEM
 There was insufficient memory to handle the requested
 .I op
@@ -175,7 +198,7 @@ control operation.
 .B EPERM
 The target file
 .I fd
-is not supported by
+does not support
 .BR epoll .
 .SH CONFORMING TO
 .BR epoll_ctl (2)
diff --git a/man2/epoll_wait.2 b/man2/epoll_wait.2
index 89b040b7f..5bc472f7c 100644
--- a/man2/epoll_wait.2
+++ b/man2/epoll_wait.2
@@ -108,13 +108,12 @@ requested events occurred or the
 expired.
 .TP
 .B EINVAL
-The supplied file descriptor,
-.IR epfd ,
+.IR epfd 
 is not an
 .B epoll
-file descriptor, or the
+file descriptor, or
 .I maxevents
-parameter is less than or equal to zero.
+is less than or equal to zero.
 .SH CONFORMING TO
 .BR epoll_wait (2)
 is a new API introduced in Linux kernel 2.5.44.