diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7c5c344c72..14c128b1d3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-23  Nigel Stephens  <nigel@mips.com>
+
+	* config/tc-mips.c (nopic_need_relax): Handle -fdata-sections
+	generated .sbss.* and .gnu.linkonce.sb.*.
+
 2006-06-23  Thiemo Seufer  <ths@mips.com>
             David Ung  <davidu@mips.com>
 
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 19e016130e..9f995c44e4 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -13113,6 +13113,8 @@ nopic_need_relax (symbolS *sym, int before_relaxing)
 	  change = (strcmp (segname, ".sdata") != 0
 		    && strcmp (segname, ".sbss") != 0
 		    && strncmp (segname, ".sdata.", 7) != 0
+		    && strncmp (segname, ".sbss.", 6) != 0
+		    && strncmp (segname, ".gnu.linkonce.sb.", 17) != 0
 		    && strncmp (segname, ".gnu.linkonce.s.", 16) != 0);
 	}
       return change;