diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 19a0aa361e..ad68efad7e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-22  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.base/signull.c: Use sigjmp_buf instead of jmp_buf.
+
 2004-05-21  Joel Brobecker  <brobecker@gnat.com>
             Daniel Jacobowitz  <drow@mvista.com>
 
diff --git a/gdb/testsuite/gdb.base/signull.c b/gdb/testsuite/gdb.base/signull.c
index 6c9ad8532d..dd77bbdec0 100644
--- a/gdb/testsuite/gdb.base/signull.c
+++ b/gdb/testsuite/gdb.base/signull.c
@@ -34,7 +34,7 @@ typedef long code_t (void);
 static volatile data_t *data[10];
 static volatile code_t *code[10];
 
-jmp_buf env;
+sigjmp_buf env;
 
 extern void
 keeper (int sig)