diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8dcd6ffc3f..f355c9cdc8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-09  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/tc-arm.c (arm_cpus): Add cortex-a17.
+
 2014-09-03  Jiong Wang  <jiong.wang@arm.com>
 
 	* config/tc-aarch64.c (parse_sys_reg): Remove the restriction on op0
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 0e6cb7a9ef..cd3db2b13f 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -24392,6 +24392,8 @@ static const struct arm_cpu_option_table arm_cpus[] =
 								  "Cortex-A12"),
   ARM_CPU_OPT ("cortex-a15",	ARM_ARCH_V7VE,   FPU_ARCH_NEON_VFP_V4,
 								  "Cortex-A15"),
+  ARM_CPU_OPT ("cortex-a17",	ARM_ARCH_V7VE,   FPU_ARCH_NEON_VFP_V4,
+								  "Cortex-A17"),
   ARM_CPU_OPT ("cortex-a53",    ARM_ARCH_V8A,    FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
 								  "Cortex-A53"),
   ARM_CPU_OPT ("cortex-a57",    ARM_ARCH_V8A,    FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,