diff --git a/gas/ChangeLog b/gas/ChangeLog
index a12e2716af..592b8de2a3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-21  I-Jui Sung  <ijsung@gmail.com>
+
+	* config/tc-arm.c (arm_cpus): Add Faraday ARMv4 and ARMv5TE
+	compatible cores: fa526, fa626, fa626te, fa726te.
+	* doc/c-arm.texi (ARM Opts): Add -mcpu={fa526, fa626, fa626te,
+	fa726te} options.
+
 2008-05-14  Alan Modra  <amodra@bigpond.net.au>
 
 	* Makefile.am: Run "make dep-am".
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index c0c5426f2c..31d4a5b38a 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -20082,6 +20082,8 @@ static const struct arm_cpu_option_table arm_cpus[] =
   {"arm922t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
   {"arm940t",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,    NULL},
   {"arm9tdmi",		ARM_ARCH_V4T,	 FPU_ARCH_FPA,	  NULL},
+  {"fa526",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL},
+  {"fa626",		ARM_ARCH_V4,	 FPU_ARCH_FPA,	  NULL},
   /* For V5 or later processors we default to using VFP; but the user
      should really set the FPU type explicitly.	 */
   {"arm9e-r0",		ARM_ARCH_V5TExP, FPU_ARCH_VFP_V2, NULL},
@@ -20105,6 +20107,8 @@ static const struct arm_cpu_option_table arm_cpus[] =
   {"arm1022e",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
   {"arm1026ejs",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, "ARM1026EJ-S"},
   {"arm1026ej-s",	ARM_ARCH_V5TEJ,	 FPU_ARCH_VFP_V2, NULL},
+  {"fa626te",		ARM_ARCH_V5TE,	 FPU_NONE,	  NULL},
+  {"fa726te",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP_V2, NULL},
   {"arm1136js",		ARM_ARCH_V6,	 FPU_NONE,	  "ARM1136J-S"},
   {"arm1136j-s",	ARM_ARCH_V6,	 FPU_NONE,	  NULL},
   {"arm1136jfs",	ARM_ARCH_V6,	 FPU_ARCH_VFP_V2, "ARM1136JF-S"},
@@ -20461,7 +20465,7 @@ struct arm_long_option_table arm_long_opts[] =
   {"mfloat-abi=", N_("<abi>\t  assemble for floating point ABI <abi>"),
    arm_parse_float_abi, NULL},
 #ifdef OBJ_ELF
-  {"meabi=", N_("<ver>\t  assemble for eabi version <ver>"),
+  {"meabi=", N_("<ver>\t\t  assemble for eabi version <ver>"),
    arm_parse_eabi, NULL},
 #endif
   {NULL, NULL, 0, NULL}
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index dc7e1f6ded..6c027bdae5 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -1,4 +1,4 @@
-@c Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+@c Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008
 @c Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
@@ -81,6 +81,8 @@ recognized:
 @code{arm922t},
 @code{arm940t},
 @code{arm9tdmi},
+@code{fa526} (Faraday FA526 processor),
+@code{fa626} (Faraday FA626 processor),
 @code{arm9e},
 @code{arm926e},
 @code{arm926ej-s},
@@ -99,6 +101,8 @@ recognized:
 @code{arm1020e},
 @code{arm1022e},
 @code{arm1026ej-s},
+@code{fa626te} (Faraday FA626TE processor),
+@code{fa726te} (Faraday FA726TE processor),
 @code{arm1136j-s},
 @code{arm1136jf-s},
 @code{arm1156t2-s},