diff --git a/ChangeLog b/ChangeLog
index 83e6db46c..5db5a35e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Don't compile timeloop on Minix. 
+	(Leonard den Ottolander)
+
 2006-05-22  Sebastian Wilhelmi  <wilhelmi@google.com>
 
 	* glib/gthread.c (g_thread_init_glib): Run _g_atomic_thread_init
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 83e6db46c..5db5a35e6 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-05-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Don't compile timeloop on Minix. 
+	(Leonard den Ottolander)
+
 2006-05-22  Sebastian Wilhelmi  <wilhelmi@google.com>
 
 	* glib/gthread.c (g_thread_init_glib): Run _g_atomic_thread_init
diff --git a/configure.in b/configure.in
index 70b037368..833648d86 100644
--- a/configure.in
+++ b/configure.in
@@ -1391,7 +1391,7 @@ AC_SUBST(PLATFORMDEP)
 
 AC_MSG_CHECKING([whether to compile timeloop])
 case "$host" in
-  *-*-cygwin*|*-*-mingw*)
+  *-*-cygwin*|*-*-mingw*|*-*-minix)
     enable_timeloop=no
     ;;
   *)