diff --git a/gas/ChangeLog b/gas/ChangeLog
index 12e037417a..4aaef65990 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,11 +1,12 @@
-2005-03-01  Ramana Radhakrishnan  <ramana@gnumenor>
+2005-03-02  Alan Modra  <amodra@bigpond.net.au>
+
+	* symbols.c (fb_label_name): Allow an augend of 2 for mmix.
+
+2005-03-01  Ramana Radhakrishnan  <ramana.radhakrishnan@codito.com>
 
 	PR gas/708
-	* config/tc-arc.c(md_assemble):Initialize suffix for extension
+	* config/tc-arc.c (md_assemble): Initialize suffix for extension
 	suffixes also.
-	* testsuite/gas/arc/extensions.s:New file 
-	* testsuite/gas/arc/extensions.d:New file
-
 
 2005-03-01  Alan Modra  <amodra@bigpond.net.au>
 
diff --git a/gas/symbols.c b/gas/symbols.c
index 3ea11ab25f..d1c7ad3021 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -1,6 +1,6 @@
 /* symbols.c -symbol table-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004
+   1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -1561,7 +1561,13 @@ fb_label_name (long n,	/* We just saw "n:", "nf" or "nb" : n a number.  */
   char symbol_name_temporary[20];	/* Build up a number, BACKWARDS.  */
 
   know (n >= 0);
-  know (augend == 0 || augend == 1);
+  know (
+#ifdef TC_MMIX
+	(unsigned long) augend <= 2 /* See mmix_fb_label.  */
+#else
+	(unsigned long) augend <= 1
+#endif
+	);
   p = symbol_name_build;
 #ifdef LOCAL_LABEL_PREFIX
   *p++ = LOCAL_LABEL_PREFIX;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 389ecb7b74..d684ba4325 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-01  Ramana Radhakrishnan  <ramana.radhakrishnan@codito.com>
+
+	* gas/arc/extensions.s: New file.
+	* gas/arc/extensions.d: New file.
+
 2005-03-01  Nick Clifton  <nickc@redhat.com>
 
 	* gas/arm/arm.exp (undefined): Run a COFF variant of this test for