diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c7d358c00..96439a38a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Fri May  5 23:32:07 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* errno.cc (errmap): Correct DIRECTORY mapping to ENOTDIR.
+
 2000-05-04  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* Makefile.in (install): Install profile startup and library.
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index 70603abb3..56b2e9afc 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -885,7 +885,7 @@ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-gstabs+ -O2"
   else
     CFLAGS="-O2"
   fi
diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in
index ac7d9759d..65f252068 100644
--- a/winsup/cygwin/configure.in
+++ b/winsup/cygwin/configure.in
@@ -43,7 +43,7 @@ dnl normal versions of a library), tasteless as that idea is.
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-gstabs+ -O2"
   else
     CFLAGS="-O2"
   fi
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 2f51ac588..8ffd531b8 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -79,7 +79,7 @@ errmap[] =
   X (NO_DATA,			EPIPE),
   X (PIPE_NOT_CONNECTED,	ECOMM),
   X (MORE_DATA,			EAGAIN),
-  X (DIRECTORY,			EISDIR),
+  X (DIRECTORY,			ENOTDIR),
   X (PIPE_CONNECTED,		EBUSY),
   X (PIPE_LISTENING,		ECOMM),
   X (NO_TOKEN,			EINVAL),