diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index d73ab54215..9d0e684f10 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -122,7 +122,7 @@
         <test name="array3">
             <mark-failure>
                 <toolset name="borland-5.5*"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5.6*"/>
                 <toolset name="msvc-6.5"/>
                 <toolset name="msvc-6.5_stlport4"/>
                 <toolset name="msvc-7.0"/>
@@ -136,7 +136,7 @@
         <test name="array4">
             <mark-failure>
                 <toolset name="borland-5.5*"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5.6*"/>
                 <toolset name="msvc-6.5"/>
                 <toolset name="msvc-6.5_stlport4"/>
                 <toolset name="msvc-7.0"/>
@@ -1546,7 +1546,7 @@
         <mark-expected-failures>
             <!-- STLPort bug -->
             <test name="seekable_file_test"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5.6*"/>
             <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
             <toolset name="*como-4_3_3*"/>
             <toolset name="*stlport"/>
@@ -1636,7 +1636,7 @@
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="compose_test"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5.6*"/>
             <note author="Jonathan Turkanis">
                 Fails to compile on some installations but not others; may 
                 depend on which compiler updates have been installed
@@ -2706,7 +2706,7 @@ for more information.
           <note author="Doug Gregor" refid="3"/>
         </mark-unusable>
         <mark-unusable>
-          <toolset name="borland-5.6.4"/>
+          <toolset name="borland-5.6*"/>
           <note author="A.Meredith"/>
         </mark-unusable>
         <mark-expected-failures>
@@ -2733,7 +2733,7 @@ for more information.
             <test name="log1p_expm1_test"/>
             <toolset name="sunpro*"/>
             <note author="John Maddock">
-              std::numeric_limits&gt;long double&lt;::infinity() is apparently
+              std::numeric_limits&lt;long double&gt;::infinity() is apparently
               broken in this compiler: it's filed as bug 6347520 with Sun.
             </note>
         </mark-expected-failures>
@@ -2748,10 +2748,10 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="log1p_expm1_test"/>
-            <toolset name="borland-5.8"/>
+            <toolset name="borland-5.8*"/>
             <toolset name="borland-5.9*"/>
             <note author="A.Meredith">
-              std::numeric_limits&gt;long double&lt;::infinity() is apparently
+              std::numeric_limits&lt;long double&gt;::infinity() is apparently
               broken in this compiler.
             </note>
         </mark-expected-failures>
@@ -3222,7 +3222,7 @@ for more information.
             <toolset name="sunpro-5_3-sunos"/>
             <toolset name="tru64cxx65*"/>
             <toolset name="hp_cxx-65*"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5.6*"/>
             <toolset name="borland-5.8*"/>
             <toolset name="msvc-6.5*"/>
             <toolset name="msvc-7.0"/>
@@ -3487,8 +3487,8 @@ for more information.
         <mark-expected-failures>
             <test name="array"/>
             <toolset name="como-4_3_3*"/>
-            <toolset name="borland-5.6.4"/>
             <toolset name="sun-5.8"/>
+            <toolset name="borland-5.6*"/>
             <toolset name="borland-5.8*"/>
             <toolset name="borland-5.9*"/>
             <note refid="27" author="Thorsten Ottosen"/>
@@ -3670,7 +3670,7 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="unicode_iterator_test"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5.6*"/>
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
             <note author="John Maddock" refid="6"/>