diff --git a/Jamfile.v2 b/Jamfile.v2
index 1e43193fcf..fe370804c1 100644
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -138,24 +138,27 @@ rule tag ( name : type ? : property-set )
             name = [ stage.add-variant-and-compiler $(name) 
               : $(type) : $(property-set) ] ;
             
+            local version-tag = [ MATCH "^([^.]+)[.]([^.]+)" : $(BOOST_VERSION[1]) ] ;
+            version-tag = $(version-tag:J="_") ;
+            
             # On NT, library with version suffix won't be recognized
             # by linkers. On CYGWIN, we get strage duplicate symbol
             # errors when library is generated with version suffix.
             if [ $(property-set).get <os> ] in NT CYGWIN
             {
-                return $(name:B)_$(BOOST_VERSION)$(name:S) ;
+                return $(name:B)-$(version-tag)$(name:S) ;
             }
             else
             {
-                return $(name:B)_$(BOOST_VERSION)$(name:S).$(BOOST_VERSION)  ;
-            }                                                  
+                return $(name:B)-$(version-tag)$(name:S).$(BOOST_VERSION)  ;
+            }
         }
         else
         {
             return [ stage.add-variant-and-compiler $(name) 
               : $(type) : $(property-set) ] ;
-        }        
-    }                   
+        }
+    }
 }
 
 # Install to system location.
diff --git a/tools/build b/tools/build
index b1399c29ad..f191d632c3 160000
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit b1399c29ad03cfc9198729f1116349116e104abd
+Subproject commit f191d632c37072dfeba5043a43d7934dc5e803ff