diff --git a/base.jam b/base.jam
deleted file mode 100644
index c0036c4b..00000000
--- a/base.jam
+++ /dev/null
@@ -1,26 +0,0 @@
-# copyright John Maddock 2003
-
-#
-# this template defines the options common to
-# all regex builds and tests:
-#
-template regex-options
-   : # sources
-   : # requirements
-     <define>BOOST_REGEX_NO_LIB=1        
-     <debug><define>BOOST_REGEX_CONFIG_INFO=1
-     <sysinclude>$(BOOST_ROOT)
-     # como requires this:
-     <como-win32><*><define>BOOST_REGEX_NO_W32=1
-   ;
-
-#
-# this template defines the options common to
-# all regex dll builds and tests:
-#
-template regex-dll-options
-   : <template>regex-options # sources
-   : # requirements
-     <define>BOOST_REGEX_DYN_LINK=1      
-     <runtime-link>dynamic
-   ;
diff --git a/build/Jamfile b/build/Jamfile
index 23dba834..0fcf024b 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -2,7 +2,30 @@
 
 subproject libs/regex/build ;
 
-import ../base ;
+#
+# this template defines the options common to
+# all regex builds and tests:
+#
+template regex-options
+   : # sources
+   : # requirements
+     <define>BOOST_REGEX_NO_LIB=1        
+     <debug><define>BOOST_REGEX_CONFIG_INFO=1
+     <sysinclude>$(BOOST_ROOT)
+     # como requires this:
+     <como-win32><*><define>BOOST_REGEX_NO_W32=1
+   ;
+
+#
+# this template defines the options common to
+# all regex dll builds and tests:
+#
+template regex-dll-options
+   : <template>regex-options # sources
+   : # requirements
+     <define>BOOST_REGEX_DYN_LINK=1      
+     <runtime-link>dynamic
+   ;
 
 SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
        cregex fileiter posix_api regex regex_debug
@@ -142,3 +165,4 @@ stage bin-stage : <lib>boost_regex <dll>boost_regex
 
 
 
+
diff --git a/example/Jamfile b/example/Jamfile
index 987203a0..a3246a82 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -3,7 +3,7 @@
 subproject libs/regex/example ;
 
 # bring in the rules for testing
-import testing ../base ;
+import testing  ;
 
 rule regex-test-run ( sources + : input * )
 {
@@ -11,7 +11,7 @@ rule regex-test-run ( sources + : input * )
            run
              # sources
              $(sources)
-             <template>regex-options
+             <template>../build/regex-options
 
              # dependencies
              <lib>../build/boost_regex
@@ -51,3 +51,4 @@ test-suite regex-examples :
 
 
 
+
diff --git a/test/Jamfile b/test/Jamfile
index 5ae40880..060d7ce0 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -3,14 +3,14 @@
 subproject libs/regex/test ;
 
 # bring in the rules for testing
-import testing ../base ;
+import testing ;
 
 #
 # this template defines the options common to
 # all regex tests:
 #
 template test 
-   : <template>regex-options 
+   : <template>../build/regex-options 
      <lib>../build/boost_regex            # sources
    : <threading>multi
    ;
@@ -44,7 +44,7 @@ rule regex-test ( name : sources + : requirements * : input-files * )
 # all regex dll tests:
 #
 template test-dll 
-   : <template>regex-dll-options 
+   : <template>../build/regex-dll-options 
      <dll>../build/boost_regex            # sources
    : <threading>multi
    ;
@@ -133,3 +133,4 @@ test-suite regex
 
 
 
+