diff --git a/ChangeLog b/ChangeLog
index 34cb64ed8f..2a9faed6a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-30  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/sparc/sparc32/__longjmp.S: Include bits/setjmp.h not
+	jmp_buf.h.  Patch by David S. Miller <davem@dm.cobaltmicro.com>.
+
 	* sysdeps/libm-i387/s_fdim.S: Reverse arguments of instruction
 	changed in last patch.
 	* sysdeps/libm-i387/s_fdimf.S: Likewise.
diff --git a/sysdeps/sparc/sparc32/__longjmp.S b/sysdeps/sparc/sparc32/__longjmp.S
index 6f984b98e9..1d49b264bb 100644
--- a/sysdeps/sparc/sparc32/__longjmp.S
+++ b/sysdeps/sparc/sparc32/__longjmp.S
@@ -19,7 +19,8 @@
 #include <sysdep.h>
 
 #define _ASM 1
-#include <jmp_buf.h>
+#define _SETJMP_H
+#include <bits/setjmp.h>
 #define ENV(base,reg) [%base + (reg * 4)]
 #define ST_FLUSH_WINDOWS 3
 #define RW_FP [%fp + 0x38]