diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3b1d03470f..0c76e0d609 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-17  Philipp Tomsich  <philipp.tomsich@theobroma-systems.com>
+
+	* config/tc-aarch64.c (aarch64_cpus): Add "xgene1".
+	* doc/c-aarch64.texi: Rename xgene-1 to xgene1.
+
 2014-11-17  Ilya Tocar  <ilya.tocar@intel.com>
 
 	* config/tc-i386.c (cpu_arch): Add .avx512vbmi.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 4f3fe4749e..fd0c20156d 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7187,7 +7187,11 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
   {"cortex-a57", AARCH64_FEATURE(AARCH64_ARCH_V8,
 				 AARCH64_FEATURE_CRC), "Cortex-A57"},
   {"thunderx", AARCH64_ARCH_V8, "Cavium ThunderX"},
+  /* The 'xgene-1' name is an older name for 'xgene1', which was used
+     in earlier releases and is superseded by 'xgene1' in all
+     tools.  */
   {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
+  {"xgene1", AARCH64_ARCH_V8, "APM X-Gene 1"},
   {"generic", AARCH64_ARCH_V8, NULL},
 
   {NULL, AARCH64_ARCH_NONE, NULL}
diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi
index f3d4e41a4a..8e22b21cbb 100644
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -59,7 +59,7 @@ on the target processor.  The following processor names are recognized:
 @code{cortex-a57},
 @code{thunderx},
 and
-@code{xgene-1}.
+@code{xgene1}.
 The special name @code{all} may be used to allow the assembler to accept
 instructions valid for any supported processor, including all optional
 extensions.