diff --git a/v1/dmc-stlport-tools.jam b/v1/dmc-stlport-tools.jam
index 89c7e6fc8..aa8c60d54 100644
--- a/v1/dmc-stlport-tools.jam
+++ b/v1/dmc-stlport-tools.jam
@@ -12,8 +12,10 @@
 
 extends-toolset dmc ;
 
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
+STLPORT_LIB_BASE_NAME ?= stlp45dm ;
+
 SEARCH on stlport.jam = $(BOOST_BUILD_PATH) ;
 include stlport.jam ;
 
-STLPORT_LIB_BASE_NAME = stlp45dm ;
-
diff --git a/v1/gcc-stlport-tools.jam b/v1/gcc-stlport-tools.jam
index 12c85867c..576b724cf 100644
--- a/v1/gcc-stlport-tools.jam
+++ b/v1/gcc-stlport-tools.jam
@@ -5,6 +5,8 @@
 # this is simply an extension to the gcc toolset. 
 extends-toolset gcc ;
 
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
 if $(NT)
 {
     STLPORT_LIB_BASE_NAME = stlport_cygwin ;
diff --git a/v1/intel-win32-7.1-vc6-stlport-4.5.3-tools.jam b/v1/intel-win32-7.1-vc6-stlport-4.5.3-tools.jam
index c7acc97b5..39e29ea0a 100644
--- a/v1/intel-win32-7.1-vc6-stlport-4.5.3-tools.jam
+++ b/v1/intel-win32-7.1-vc6-stlport-4.5.3-tools.jam
@@ -12,6 +12,4 @@
     feature stlport-iostream : on off ;
     C++FLAGS = [ difference $(C++FLAGS) : /Qmsvc-stlport ] ;
     DEFINES = [ difference $(DEFINES) : _STLP_NO_SGI_IOSTREAMS=1 ] ;
-    STDLIBPATH += [ join [ get-stlport-root ] $(SLASH)lib ] ;
 }
- 
\ No newline at end of file
diff --git a/v1/intel-win32-stlport-tools.jam b/v1/intel-win32-stlport-tools.jam
index 1f8eaea72..9f6cc467a 100644
--- a/v1/intel-win32-stlport-tools.jam
+++ b/v1/intel-win32-stlport-tools.jam
@@ -8,12 +8,14 @@
 # program as the column heading for HTML tables. Must not include version number.
 #//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a><br><a href="http://www.stlport.org/">STLport</a>
 
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
 STLPORT_LIB_BASE_NAME ?= stlport_icl ;
 
 {
     local INTEL_BASE_MSVC_TOOLSET = msvc-stlport ;
     extends-toolset intel-win32 ;
-    
+
     # Intel's compiler doesn't seem to encode the path to the STLPort
     # library in shared libs.  This path setting works for the Python
     # tests, and seems to be unneeded for the regression tests, but it
diff --git a/v1/mingw-stlport-tools.jam b/v1/mingw-stlport-tools.jam
index 4c07f4820..ba362ef5e 100644
--- a/v1/mingw-stlport-tools.jam
+++ b/v1/mingw-stlport-tools.jam
@@ -5,7 +5,8 @@
 
 extends-toolset mingw ;
 
-CURR_TOOLSET          = mingw-stlport ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
 STLPORT_LIB_BASE_NAME = stlport_mingw32 ;
 
 SEARCH on stlport.jam = $(BOOST_BUILD_PATH) ;
diff --git a/v1/msvc-stlport-tools.jam b/v1/msvc-stlport-tools.jam
index 5f0ffc361..cd891ab80 100644
--- a/v1/msvc-stlport-tools.jam
+++ b/v1/msvc-stlport-tools.jam
@@ -8,7 +8,9 @@
 
 extends-toolset msvc ;
 
-CURR_TOOLSET = msvc-stlport ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_STATIC_SUFFIX ;
+
 STLPORT_LIB_BASE_NAME ?= stlport_vc6 ;
 STLPORT_LIB_STATIC_SUFFIX ?= _static ;
 
@@ -17,4 +19,3 @@ SEARCH on stlport.jam = $(BOOST_BUILD_PATH) ;
 include stlport.jam ;
 
 flags msvc-stlport VC_STDLIB_PATH <stlport-iostream>on : [ join [ get-stlport-root ] $(SLASH)$(STLPORT_LIB_DIRECTORY) ] ;
-#~ flags msvc-stlport THIS_FLAG_IS_UNUSED_BUT_ENSURES_TAG_ISNT_IGNORED <stlport-version> :  ;
diff --git a/v1/stlport.jam b/v1/stlport.jam
index 30cde9813..4cf5c3595 100644
--- a/v1/stlport.jam
+++ b/v1/stlport.jam
@@ -7,9 +7,6 @@
 # Use this toolset to add STLport flavor for any base toolset
 # define STLPORT_LIB_BASE_NAME to the shared between debug and release 
 # versions prefix for stlport library name for example stlport_sunpro
-flags stlport STLPORT_LIB_BASE_NAME ;
-flags stlport STLPORT_LIB_DEBUG_SUFFIX ;
-flags stlport STLPORT_LIB_STATIC_SUFFIX ;
 
 # STLport iostreams or native iostreams
 feature stlport-iostream : on off ;
diff --git a/v1/sunpro-stlport-tools.jam b/v1/sunpro-stlport-tools.jam
index 385370c2d..0f3725572 100644
--- a/v1/sunpro-stlport-tools.jam
+++ b/v1/sunpro-stlport-tools.jam
@@ -9,7 +9,8 @@
 # this is simply an extension to the sunpro toolset. 
 extends-toolset sunpro ;
 
-CURR_TOOLSET          = sunpro-stlport ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
 STLPORT_LIB_BASE_NAME = stlport_sunpro ;
 
 # bring in the STLPort configuration
diff --git a/v1/vc7-stlport-tools.jam b/v1/vc7-stlport-tools.jam
index 3cc1d5013..d59a8b855 100644
--- a/v1/vc7-stlport-tools.jam
+++ b/v1/vc7-stlport-tools.jam
@@ -1,7 +1,8 @@
 extends-toolset msvc-stlport ;
 
-CURR_TOOLSET = vc7-stlport ;
-STLPORT_LIB_BASE_NAME = stlport_vc70 ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
+
+STLPORT_LIB_BASE_NAME ?= stlport_vc70 ;
 
 # bring in the STLPort configuration
 SEARCH on stlport.jam = $(BOOST_BUILD_PATH) ;
diff --git a/v1/vc7.1-stlport-tools.jam b/v1/vc7.1-stlport-tools.jam
index 229b77737..f0f43694c 100644
--- a/v1/vc7.1-stlport-tools.jam
+++ b/v1/vc7.1-stlport-tools.jam
@@ -1,6 +1,6 @@
 extends-toolset msvc ;
 
-CURR_TOOLSET = vc-7.1-stlport ;
+flags $(gCURRENT_TOOLSET) STLPORT_LIB_BASE_NAME ;
 STLPORT_LIB_BASE_NAME = stlport_vc71 ;
 
 # bring in the STLPort configuration