diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8433625876..1c7a2a60f6 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-29  DJ Delorie  <dj@redhat.com>
+
+	* readelf.c (process_section_headers): Add H8/300 support.
+
 2006-06-23  Richard Sandiford  <richard@codesourcery.com>
 
 	* objcopy.c (localize_hidden): New variable.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index b900b76e22..8550ce4c58 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -3971,6 +3971,23 @@ process_section_headers (FILE *file)
 	  && find_section (".gcc_compiled_long32") == NULL)
 	eh_addr_size = 8;
       break;
+
+    case EM_H8_300:
+    case EM_H8_300H:
+      switch (elf_header.e_flags & EF_H8_MACH)
+	{
+	case E_H8_MACH_H8300:
+	case E_H8_MACH_H8300HN:
+	case E_H8_MACH_H8300SN:
+	case E_H8_MACH_H8300SXN:
+	  eh_addr_size = 2;
+	  break;
+	case E_H8_MACH_H8300H:
+	case E_H8_MACH_H8300S:
+	case E_H8_MACH_H8300SX:
+	  eh_addr_size = 4;
+	  break;
+	}
     }
 
 #define CHECK_ENTSIZE_VALUES(section, i, size32, size64) \