diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2932e655c3..b69fa8221e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-11  Tomas Frydrych  <dr.tomas@yahoo.co.uk>
+
+	PR gas/3172
+	* config/tc-arm.c (parse_typed_reg_or_scalar): Accept wCg class
+	registers as a sub-class of wC registers.
+
 2006-09-11  Alan Modra  <amodra@bigpond.net.au>
 
 	PR gas/3165
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index a6f8b6bd3f..19244d7d5c 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1261,7 +1261,9 @@ parse_typed_reg_or_scalar (char **ccp, enum arm_reg_type type,
           && (reg->type == REG_TYPE_VFS || reg->type == REG_TYPE_VFD))
       || (type == REG_TYPE_NSDQ
           && (reg->type == REG_TYPE_VFS || reg->type == REG_TYPE_VFD
-              || reg->type == REG_TYPE_NQ)))
+              || reg->type == REG_TYPE_NQ))
+      || (type == REG_TYPE_MMXWC
+	  && (reg->type == REG_TYPE_MMXWCG)))
     type = reg->type;
 
   if (type != reg->type)