diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7dd4f1c5c6..35c043f1fd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-07  Guy Martin  <gmsoft@gentoo.org>
+
+	Committed by Randolph Chung.
+	* hppa-linux-nat.c: Include the correct version of the header file
+	depending on the kernel version.
+
 2004-06-06  Randolph Chung  <tausq@debian.org>
 
 	* infrun.c (trap_expected_after_continue): Remove HP_OS_BUG workaround.
diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c
index d88c142dd0..c15e1ab712 100644
--- a/gdb/hppa-linux-nat.c
+++ b/gdb/hppa-linux-nat.c
@@ -27,7 +27,13 @@
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
 #include <string.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,43)
+#include <asm/offset.h>
+#else
 #include <asm/offsets.h>
+#endif
 
 #include "hppa-tdep.h"