diff --git a/ChangeLog b/ChangeLog
index 36be5d200..126821fc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 36be5d200..126821fc8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 36be5d200..126821fc8 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 36be5d200..126821fc8 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 36be5d200..126821fc8 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 36be5d200..126821fc8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-04-03  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Remove AC_CYGWIN, obsolete. Don't let pthreads be
+	found on Cygwin, they don't work. (#138401, Roger Leigh)
+
 2004-03-31  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/spawn-test-win32-gui.c: Minor Cygwin fix. (#138405, Roger
diff --git a/configure.in b/configure.in
index c0b2d598a..69825d12a 100644
--- a/configure.in
+++ b/configure.in
@@ -310,7 +310,6 @@ if test x"$glib_native_win32" = xyes; then
   fi
 fi
 
-AC_CYGWIN
 AC_EXEEXT
 
 # define a MAINT-like variable REBUILD which is set if Perl
@@ -1394,21 +1393,28 @@ if test x"$have_threads" != xno; then
     # both CPPFLAG and LIBS. 
     # One of them does for most gcc versions and some other platforms/compilers
     # too and could be considered as the canonical way to go. 
-    for flag in pthread pthreads; do
-      glib_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -$flag"
-      AC_TRY_RUN(glib_thread_test(0),
-                 glib_flag_works=yes,
-                 glib_flag_works=no,
-                 [AC_LINK_IFELSE(glib_thread_test(0),
-                                 glib_flag_works=yes,
-                                 glib_flag_works=no)])
-      CFLAGS="$glib_save_CFLAGS"
-      if test $glib_flag_works = yes ; then
-         G_THREAD_CFLAGS=-$flag
-	 G_THREAD_LIBS=-$flag
-      fi
-    done
+    case $host in
+      *-*-cygwin*)
+         # skip cygwin -pthread or -pthreads test
+         ;;
+      *)
+        for flag in pthread pthreads; do
+          glib_save_CFLAGS="$CFLAGS"
+          CFLAGS="$CFLAGS -$flag"
+          AC_TRY_RUN(glib_thread_test(0),
+                     glib_flag_works=yes,
+                     glib_flag_works=no,
+                     [AC_LINK_IFELSE(glib_thread_test(0),
+                                     glib_flag_works=yes,
+                                     glib_flag_works=no)])
+          CFLAGS="$glib_save_CFLAGS"
+          if test $glib_flag_works = yes ; then
+             G_THREAD_CFLAGS=-$flag
+	     G_THREAD_LIBS=-$flag
+          fi
+        done
+         ;;
+    esac 
   fi
 
   if test x"$G_THREAD_CFLAGS" = x; then