diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 7ba496d06..f0ce98a28 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-22  Alexandre Oliva  <aoliva@redhat.com>
 
+	* libc/include/machine/setjmp.h [__H8300__] (_JBTYPE): Define,
+	instead of typedefing jmp_buf.
+
 	2003-07-02  Richard Sandiford  <rsandifo@redhat.com>
 	* libc/machine/h8300/Makefile.am (lib_a_SOURCES): Add h8sx_strcpy.S.
 	* libc/machine/h8300/defines.h (LEN): New macro.
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index 3fa67b508..326b743d0 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -86,7 +86,7 @@ _BEGIN_STD_C
 
 #ifdef __H8300__
 #define _JBLEN 5
-typedef int jmp_buf[_JBLEN];
+#define _JBTYPE int
 #endif
 
 #ifdef __H8300H__