diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 525167caf..ef02345a9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-05  Christopher Faylor  <cgf@redhat.com>
+
+	* errno.cc: Change EPERM associated text to "Operation not permitted"
+	throughout.
+
 2002-03-05  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler_socket.cc (fhandler_socket::close): Respond to signals while
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 0643647b2..fc9a455f0 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -153,7 +153,7 @@ extern "C" {
 const NO_COPY char __declspec(dllexport) * const _sys_errlist[]=
 {
 /*      NOERROR 0       */ "No error",
-/*	EPERM 1		*/ "Not super-user",
+/*	EPERM 1		*/ "Operation not permitted",
 /*	ENOENT 2	*/ "No such file or directory",
 /*	ESRCH 3		*/ "No such process",
 /*	EINTR 4		*/ "Interrupted system call",
@@ -308,10 +308,13 @@ extern "C" char *
 strerror (int errnum)
 {
   const char *error;
+  if (errnum < _sys_nerr)
+    error = _sys_errlist [errnum];
+  else
   switch (errnum)
     {
     case EPERM:
-      error = "Not owner";
+      error = "Operation not permitted";
       break;
     case ENOENT:
       error = "No such file or directory";