diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6a73a0c1f4..33e0305380 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-18  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* config/tc-s390.c (md_parse_option): Add -march=all option which
+	switches to the highest available CPU.
+
 2011-03-17  Alan Modra  <amodra@gmail.com>
 
 	PR 12569
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index ca7ad3b58d..37c0e4d18c 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -398,6 +398,8 @@ md_parse_option (int c, char *arg)
 	    current_cpu = S390_OPCODE_Z10;
 	  else if (strcmp (arg + 5, "z196") == 0)
 	    current_cpu = S390_OPCODE_Z196;
+	  else if (strcmp (arg + 5, "all") == 0)
+	    current_cpu = S390_OPCODE_MAXCPU - 1;
 	  else
 	    {
 	      as_bad (_("invalid switch -m%s"), arg);