diff --git a/ChangeLog b/ChangeLog
index 34607423ea..762b6f213f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-29  Ulrich Drepper  <drepper@redhat.com>
 
+	* malloc/Makefile: Don't build memusagestat if cross-compiling.
+
 	* sysdeps/generic/dl-sysdep.c (set_seen): Fix typo.
 
 	* math/libm-test.inc (rint_test): Add a few more tests for round
diff --git a/malloc/Makefile b/malloc/Makefile
index d69d49bbd3..84324ca563 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -69,12 +69,17 @@ address-width=18
 endif
 endif
 
+# Unless we get a test for the availability of libgd which also works
+# for cross-compiling we disable the memusagestat generation in this
+# situation.
+ifneq ($(cross-compiling),yes)
 # If the gd library is available we build the `memusagestat' program.
 ifneq ($(LIBGD),no)
 install-bin += memusagestat memusage
 generated += memusagestat memusage
 extra-objs += memusagestat.o
 endif
+endif
 
 # Another goal which can be used to override the configure decision.
 .PHONY: do-memusagestat