diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e2c25b7a0..cb54456ec 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-02  Christopher Faylor  <cgf@timesys.com>
+
+	* external.cc (cygwin_internal): Set errno on failure.
+
 2006-04-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pipe.cc (DEFAULT_PIPEBUFSIZE): Raise to 64K.
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index 71b790c50..62007304f 100644
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -351,5 +351,6 @@ cygwin_internal (cygwin_getinfo_types t, ...)
       default:
 	break;
     }
+  set_errno (ENOSYS);
   return (unsigned long) -1;
 }