diff --git a/src/ChangeLog b/src/ChangeLog
index 6b3a832e840..28030aef0e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2004-12-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+	* emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
+	reset_malloc_hooks.
+
+	* keyboard.c (handle_async_input, input_available_signal): Add
+	! defined (SYSTEM_MALLOC) around thread code.
+
 	* alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
 
 2004-12-07  Stefan  <monnier@iro.umontreal.ca>
diff --git a/src/emacs.c b/src/emacs.c
index b6b7f986e94..8e2443e8f1f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2238,7 +2238,7 @@ You must run Emacs in batch mode in order to dump it.  */)
   memory_warnings (my_edata, malloc_warning);
 #endif /* not WINDOWSNT */
 #endif
-#ifdef HAVE_GTK_AND_PTHREAD
+#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
   /* Pthread may call malloc before main, and then we will get an endless
      loop, because pthread_self (see alloc.c) calls malloc the first time
      it is called on some systems.  */
diff --git a/src/keyboard.c b/src/keyboard.c
index 3cfc1652084..19973edf33d 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6780,7 +6780,7 @@ handle_async_input ()
 #ifdef BSD4_1
   extern int select_alarmed;
 #endif
-#ifdef HAVE_GTK_AND_PTHREAD
+#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
   extern pthread_t main_thread;
   if (pthread_self () != main_thread)
     {
@@ -6826,7 +6826,7 @@ input_available_signal (signo)
 {
   /* Must preserve main program's value of errno.  */
   int old_errno = errno;
-#ifdef HAVE_GTK_AND_PTHREAD
+#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
   extern pthread_t main_thread;
   if (pthread_self () != main_thread)
     {