diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3d9b50fc32..22dc882689 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-15  Tamar Christina  <tamar.christina@arm.com>
+
+	* config/tc-arm.c (cpu_arch_ver): Renumber ARM_ARCH_V8_4A.
+	* testsuite/gas/arm/attr-march-armv8_4-a.d: New.
+
 2018-02-13  Max Filippov  <jcmvbkbc@gmail.com>
 
 	* config/tc-xtensa.c (xg_find_best_trampoline): Skip trampoline
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 7a5c02b2bb..cac4ed9ab9 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -26941,7 +26941,7 @@ static const cpu_arch_ver_table cpu_arch_ver[] =
     {16, ARM_ARCH_V8M_BASE},
     {17, ARM_ARCH_V8M_MAIN},
     {15, ARM_ARCH_V8R},
-    {16, ARM_ARCH_V8_4A},
+    {14, ARM_ARCH_V8_4A},
     {-1, ARM_ARCH_NONE}
 };
 
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_4-a.d b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
new file mode 100644
index 0000000000..af3e52b4bb
--- /dev/null
+++ b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
@@ -0,0 +1,17 @@
+# name: attributes for -march=armv8.4-a
+# source: blank.s
+# as: -march=armv8.4-a
+# readelf: -A
+# This test is only valid on EABI based ports.
+# target: *-*-*eabi* *-*-nacl*
+
+Attribute Section: aeabi
+File Attributes
+  Tag_CPU_name: "8.4-A"
+  Tag_CPU_arch: v8
+  Tag_CPU_arch_profile: Application
+  Tag_ARM_ISA_use: Yes
+  Tag_THUMB_ISA_use: Thumb-2
+  Tag_Advanced_SIMD_arch: NEON for ARMv8.1
+  Tag_MPextension_use: Allowed
+  Tag_Virtualization_use: TrustZone and Virtualization Extensions