diff --git a/test/auto-link-test/Jamfile b/test/auto-link-test/Jamfile
new file mode 100644
index 00000000..ffca9f4f
--- /dev/null
+++ b/test/auto-link-test/Jamfile
@@ -0,0 +1,94 @@
+# copyright John Maddock 2003
+
+#
+# This Jamfile tests the ability of some Windows compilers
+# to automatically link to the right lib file,
+# it is not generally applicable.
+#
+
+subproject libs/regex/test/auto-link-test ;
+
+# bring in the rules for testing
+import testing ;
+
+run 
+	# sources
+	<template>../../build/regex-options
+	../regress/parse.cpp
+	../regress/regress.cpp 
+	../regress/tests.cpp
+	<lib>../../../test/build/boost_prg_exec_monitor
+:
+:	# input files
+	../regress/tests.txt
+: 	# requirements
+	<library-path>../../../../stage/lib
+	<define>BOOST_LIB_DIAGNOSTIC=1
+: 	# program name
+	regex_regress
+          
+;
+
+run 
+	# sources
+	<template>../../build/regex-options
+	../regress/parse.cpp
+	../regress/regress.cpp 
+	../regress/tests.cpp
+	<lib>../../../test/build/boost_prg_exec_monitor
+:
+:	# input files
+	../regress/tests.txt
+: 	# requirements
+	<library-path>../../../../stage/lib
+	<define>TEST_UNICODE=1
+	<define>BOOST_LIB_DIAGNOSTIC=1
+: 	# program name
+	wide_regex_regress
+          
+;
+
+# and now the dll versions:
+
+run 
+	# sources
+	<template>../../build/regex-options
+	../regress/parse.cpp
+	../regress/regress.cpp 
+	../regress/tests.cpp
+	<lib>../../../test/build/boost_prg_exec_monitor
+:
+:	# input files
+	../regress/tests.txt
+: 	# requirements
+	<library-path>../../../../stage/lib
+	<define>BOOST_ALL_DYN_LINK=1
+	<runtime-link>dynamic
+	<define>BOOST_LIB_DIAGNOSTIC=1
+: 	# program name
+	regex_regress_dll
+          
+;
+
+run 
+	# sources
+	<template>../../build/regex-options
+	../regress/parse.cpp
+	../regress/regress.cpp 
+	../regress/tests.cpp
+	<lib>../../../test/build/boost_prg_exec_monitor
+:
+:	# input files
+	../regress/tests.txt
+: 	# requirements
+	<define>BOOST_ALL_DYN_LINK=1
+	<runtime-link>dynamic
+	<library-path>../../../../stage/lib
+	<define>TEST_UNICODE=1
+	<define>BOOST_LIB_DIAGNOSTIC=1
+: 	# program name
+	wide_regex_regress_dll
+          
+;
+
+