diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 2194ad5863fdfc9989e7f6ce5fbed8f5b8e99bbd..cb49b3a8d543be8e2b11b775e599b735452f072f 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-26  Richard Earnshaw  <rearnsha@arm.com>
+
+	* dyn_load.c: On NetBSD, include machine/elf_machdep.h and define
+	ELFSIZE in terms of ARCH_ELFSIZE (back-ported from gc7.0alpha1).
+
 2005-02-15  Bryce McKinlay  <mckinlay@redhat.com>
 
 	PR libgcj/19823
diff --git a/boehm-gc/dyn_load.c b/boehm-gc/dyn_load.c
index dfe0a3c87e8166d38e0bb2713451f84114f6d894..c5139aa80a8fdee315af53616e78cd3c21bfb569 100644
--- a/boehm-gc/dyn_load.c
+++ b/boehm-gc/dyn_load.c
@@ -80,6 +80,11 @@
 #   define l_name	lm_name
 #endif
 
+#if defined(NETBSD)
+#   include <machine/elf_machdep.h>
+#   define ELFSIZE ARCH_ELFSIZE
+#endif
+
 #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)