diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b01e71935a..853610128a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-17  Nick Hudson  <nick.hudson@dsl.pipex.com>
+
+	* readelf.c (get_machine_flags): Add logic for missing EF_SH flags.
+
 2006-02-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* config.in: Rebuilt.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 208b6d43e4..b8b23117bc 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2124,6 +2124,12 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
 	    case EF_SH4_NOFPU: strcat (buf, ", sh4-nofpu"); break;
 	    case EF_SH4A_NOFPU: strcat (buf, ", sh4a-nofpu"); break;
 	    case EF_SH2A_NOFPU: strcat (buf, ", sh2a-nofpu"); break;
+	    case EF_SH3_NOMMU: strcat (buf, ", sh3-nommu"); break;
+	    case EF_SH4_NOMMU_NOFPU: strcat (buf, ", sh4-nommu-nofpu"); break;
+	    case EF_SH2A_SH4_NOFPU: strcat (buf, ", sh2a-nofpu-or-sh4-nommu-nofpu"); break;
+	    case EF_SH2A_SH3_NOFPU: strcat (buf, ", sh2a-nofpu-or-sh3-nommu"); break;
+	    case EF_SH2A_SH4: strcat (buf, ", sh2a-or-sh4"); break;
+	    case EF_SH2A_SH3E: strcat (buf, ", sh2a-or-sh3e"); break;
 	    default: strcat (buf, ", unknown ISA"); break;
 	    }