diff --git a/gas/ChangeLog b/gas/ChangeLog
index b1add1e216..2ee1c9105a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-17  Mark Mitchell  <mark@codesourcery.com>
+
+	* config/tc-arm.c (arm_archs): Change "armv6" to "armv6j".
+	* doc/c-arm.texi (ARM Options): Likewise.
+
 2003-12-17  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-m32r.c (error_explicit_parallel_conflicts): Rename
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index e07185e77e..3e3daac74a 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -13340,7 +13340,7 @@ static struct arm_arch_option_table arm_archs[] =
   {"armv5te",		ARM_ARCH_V5TE,	 FPU_ARCH_VFP},
   {"armv5texp",		ARM_ARCH_V5TExP, FPU_ARCH_VFP},
   {"armv5tej",		ARM_ARCH_V5TEJ,  FPU_ARCH_VFP},
-  {"armv6",             ARM_ARCH_V6,     FPU_ARCH_VFP},
+  {"armv6j",            ARM_ARCH_V6,     FPU_ARCH_VFP},
   {"xscale",		ARM_ARCH_XSCALE, FPU_ARCH_VFP},
   {"iwmmxt",		ARM_ARCH_IWMMXT, FPU_ARCH_VFP},
   {NULL, 0, 0}
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi
index 766ac33171..8bd8fed49e 100644
--- a/gas/doc/c-arm.texi
+++ b/gas/doc/c-arm.texi
@@ -131,7 +131,7 @@ names are recognized:
 @code{armv5txm},
 @code{armv5te},
 @code{armv5texp},
-@code{armv6},
+@code{armv6j},
 @code{iwmmxt}
 and
 @code{xscale}.