Index: Jamroot
===================================================================
--- Jamroot.orig
+++ Jamroot
@@ -321,9 +321,7 @@ rule tag ( name : type ? : property-set
         if $(layout) = versioned
         {
             local result = [ common.format-name
-                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-                -$(BUILD_ID)
-                : $(name) : $(type) : $(property-set) ] ;
+                <base> <runtime> : $(name) : $(type) : $(property-set) ] ;
 
             # Optionally add version suffix. On NT, library with version suffix
             # will not be recognized by linkers. On CYGWIN, we get strage
@@ -475,13 +473,9 @@ if $(layout-versioned) && ( [ modules.pe
         return $(result) ;
     }
 
-    generate stage-unversioned : stage-proper :
-        <generating-rule>@make-unversioned-links ;
-    explicit stage-unversioned ;
-
-    generate install-unversioned : install-proper :
-        <generating-rule>@make-unversioned-links ;
-    explicit install-unversioned ;
+    # Create do-nothing aliases
+    alias stage-unversioned ;
+    alias install-unversioned ;
 }
 else
 {