diff --git a/ChangeLog b/ChangeLog
index a33c43c39..f53d809f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-06  Anders Carlsson  <andersca@imendio.com>
+
+        * configure.in:
+	Skip checking thread flags on Darwin. Fix suggested by Manish Singh.
+	(#314794, Gregor Riepl)
+	
 2006-03-01  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_listenv): Separate implementation on Win32: Use
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a33c43c39..f53d809f5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-03-06  Anders Carlsson  <andersca@imendio.com>
+
+        * configure.in:
+	Skip checking thread flags on Darwin. Fix suggested by Manish Singh.
+	(#314794, Gregor Riepl)
+	
 2006-03-01  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_listenv): Separate implementation on Win32: Use
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a33c43c39..f53d809f5 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2006-03-06  Anders Carlsson  <andersca@imendio.com>
+
+        * configure.in:
+	Skip checking thread flags on Darwin. Fix suggested by Manish Singh.
+	(#314794, Gregor Riepl)
+	
 2006-03-01  Tor Lillqvist  <tml@novell.com>
 
 	* glib/gutils.c (g_listenv): Separate implementation on Win32: Use
diff --git a/configure.in b/configure.in
index dc5eeaba4..da6753bd2 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,8 +1568,8 @@ if test x"$have_threads" != xno; then
     # One of them does for most gcc versions and some other platforms/compilers
     # too and could be considered as the canonical way to go. 
     case $host in
-      *-*-cygwin*)
-         # skip cygwin -pthread or -pthreads test
+      *-*-cygwin*|*-*-darwin*)
+         # skip cygwin and darwin -pthread or -pthreads test
          ;;
       *)
         for flag in pthread pthreads mt; do