diff --git a/ChangeLog b/ChangeLog
index 429623e9e..3c19d1774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 429623e9e..3c19d1774 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: Always call GLIB_SIZEOF(..., system_thread). Fixes
+	#65624.
+
 2001-11-28  Tor Lillqvist  <tml@iki.fi>
 
 	* glibconfig.h.win32.in: Add GLIB_SIZEOF_SIZE_T here, too.
diff --git a/configure.in b/configure.in
index cb99f2608..473852a27 100644
--- a/configure.in
+++ b/configure.in
@@ -1424,6 +1424,11 @@ if test x"$have_threads" != xno; then
 	fi
 fi	
 
+if test x"$glib_cv_sizeof_system_thread" = x; then
+   # use a pointer as a fallback.
+   GLIB_SIZEOF(,void *, system_thread)
+fi
+
 AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",
 		   [Source file containing theread implementation])
 AC_SUBST(G_THREAD_CFLAGS)
@@ -2090,11 +2095,7 @@ g_threads_impl_def=$g_threads_impl
 
 g_mutex_has_default="$mutex_has_default"
 g_mutex_sizeof="$glib_cv_sizeof_gmutex"
-if test x"$glib_cv_sizeof_system_thread" != x; then
-  g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
-else
-  g_system_thread_sizeof="$ac_cv_sizeof_void_p"
-fi
+g_system_thread_sizeof="$glib_cv_sizeof_system_thread"
 g_mutex_contents="$glib_cv_byte_contents_gmutex"
 
 g_module_suffix="$glib_gmodule_suffix"