diff --git a/build/Jamfile b/build/Jamfile
index a8dd7124..e68bec45 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -27,6 +27,16 @@ template regex-dll-options
      <runtime-link>dynamic
    ;
 
+#
+# this template defines extra settings required to work 
+# around STLPort defects when used with msvc 6:
+#
+template msvc-stlport-tricky
+   : # sources
+   : <msvc-stlport><*><runtime-build>release
+     <define>BOOST_ALL_NO_LIB=1
+   ;
+
 SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
        cregex fileiter posix_api regex regex_debug
        regex_synch w32_regex_traits wide_posix_api instances winstances ;
@@ -61,3 +71,4 @@ install regex lib
     ;
 
 
+
diff --git a/example/Jamfile b/example/Jamfile
index 171ec12f..d4e4945b 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -26,7 +26,7 @@ rule regex-test-run ( sources + : input * )
 
 test-suite regex-examples :
 
-[ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
+[ regex-test-run timer/regex_timer.cpp <template>../build/msvc-stlport-tricky : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
 [ regex-test-run jgrep/jgrep.cpp jgrep/main.cpp : -n boost/ $(BOOST_ROOT)/boost/regex.hpp ]
 [ regex-test-run snippets/credit_card_example.cpp ]
 [ regex-test-run snippets/partial_regex_grep.cpp : $(BOOST_ROOT)/libs/regex/index.htm ]
@@ -52,3 +52,5 @@ test-suite regex-examples :
 
 
 
+
+
diff --git a/test/Jamfile b/test/Jamfile
index 060d7ce0..b76e86f6 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -71,6 +71,7 @@ test-suite regex
 
       [ regex-test regex_wide_regress
           : <template>regression     # sources
+            <template>../build/msvc-stlport-tricky
           : <define>TEST_UNICODE=1   # requirements
           : regress/tests.txt        # input files
       ]
@@ -120,6 +121,7 @@ test-suite regex
 
       [ regex-test regex_wide_regress_dll
           : <template>regression-dll     # sources
+            <template>../build/msvc-stlport-tricky
           : <define>TEST_UNICODE=1   # requirements
           : regress/tests.txt        # input files
       ]
@@ -134,3 +136,6 @@ test-suite regex
 
 
 
+
+
+