diff --git a/ChangeLog b/ChangeLog
index f2b2d1530c6758c0978457d2b937509a80796094..74caece12c5f56ebd3bc3d30357c0ecd23133563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-21  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* configure.in: Check for srcdir/winsup rather than build directory
+	winsup.
+	* configure: Regenerate.
+
 2004-06-17  Corinna Vinschen  <vinschen@redhat.com>
 
 	* configure.in: Don't build Cygwin native newlib if winsup
diff --git a/configure b/configure
index 378ff4784cd432a72d9325fc7a71086b6fd284ce..729827f29bccde007e7108f18040035d234126ba 100755
--- a/configure
+++ b/configure
@@ -1366,7 +1366,7 @@ case "${target}" in
     target_configdirs="$target_configdirs target-libtermcap target-winsup"
     noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}"
     # always build newlib if winsup directory is present.
-    if test -d winsup
+    if test -d "$srcdir/winsup"
     then
       skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     else
diff --git a/configure.in b/configure.in
index f1397dbe8a44e1e530a6714cc691313fee0ba49c..4ec0d21a9e12d2d88ecaa2d134ce70a44c522ee6 100644
--- a/configure.in
+++ b/configure.in
@@ -586,7 +586,7 @@ case "${target}" in
     target_configdirs="$target_configdirs target-libtermcap target-winsup"
     noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}"
     # always build newlib if winsup directory is present.
-    if test -d winsup
+    if test -d "$srcdir/winsup"
     then
       skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     else