diff --git a/build/Jamfile b/build/Jamfile
index 8a45fa9..2fe5983 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -2,8 +2,8 @@
 
 # (C) Copyright Beman Dawes 2002, 2006
 
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
 
 # See library home page at http://www.boost.org/libs/system
 
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
new file mode 100644
index 0000000..de9f389
--- /dev/null
+++ b/build/Jamfile.v2
@@ -0,0 +1,20 @@
+# Boost System Library Build Jamfile
+
+# (C) Copyright Beman Dawes 2002, 2006
+
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
+
+# See library home page at http://www.boost.org/libs/system
+
+project boost/system
+    : source-location ../src
+    ;
+
+SOURCES = error_code ;
+
+lib boost_system
+   : $(SOURCES).cpp
+   : <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
+     <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
+   ;
diff --git a/test/Jamfile b/test/Jamfile
new file mode 100644
index 0000000..fef0463
--- /dev/null
+++ b/test/Jamfile
@@ -0,0 +1,51 @@
+# Boost System Library test Jamfile
+
+# Copyright Beman Dawes 2003, 2006
+
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt
+
+# See library home page at http://www.boost.org/libs/system
+
+subproject libs/system/test ;
+
+# bring in rules for testing
+import testing ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+    # look in BOOST_ROOT for sources first, just in this Jamfile
+    local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
+    
+   test-suite "system"
+       : [ run libs/system/test/error_code_test.cpp
+               <lib>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_STATIC_LINK
+         ]
+         [ run libs/system/test/error_code_test.cpp
+               <dll>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_DYN_LINK <runtime-link>dynamic
+               : error_code_test_dll
+         ]
+         [ run libs/system/test/error_code_user_test.cpp
+               <lib>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_STATIC_LINK
+         ]
+         [ run libs/system/test/error_code_user_test.cpp
+               <dll>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_DYN_LINK <runtime-link>dynamic
+               : error_code_user_test_dll
+         ]
+         [ run libs/system/test/system_error_test.cpp
+               <lib>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_STATIC_LINK
+         ]
+         [ run libs/system/test/system_error_test.cpp
+               <dll>../build/boost_system
+               :  :  : <sysinclude>$(BOOST_AUX_ROOT) <sysinclude>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB <define>BOOST_SYSTEM_DYN_LINK <runtime-link>dynamic
+               : system_error_test_dll
+         ]
+       ;
+}
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
new file mode 100644
index 0000000..e18d938
--- /dev/null
+++ b/test/Jamfile.v2
@@ -0,0 +1,41 @@
+# Boost System Library test Jamfile
+
+# Copyright Beman Dawes 2003, 2006
+
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt
+
+# See library home page at http://www.boost.org/libs/system
+
+project
+    : requirements
+      <library>/boost/system//boost_system
+      <define>BOOST_ALL_NO_LIB
+    ;
+
+   test-suite "system"
+       : [ run error_code_test.cpp
+           :  :  : <define>BOOST_SYSTEM_STATIC_LINK 
+                   <runtime-link>static <link>static
+         ]
+         [ run error_code_test.cpp
+           :  :  : <define>BOOST_SYSTEM_DYN_LINK 
+                 : error_code_test_dll
+         ]
+         [ run error_code_user_test.cpp
+           :  :  : <define>BOOST_SYSTEM_STATIC_LINK 
+                   <runtime-link>static <link>static
+         ]
+         [ run error_code_user_test.cpp
+           :  :  : <define>BOOST_SYSTEM_DYN_LINK 
+                 : error_code_user_test_dll
+         ]
+         [ run system_error_test.cpp
+           :  :  : <define>BOOST_ESYSTEM_STATIC_LINK 
+                   <runtime-link>static <link>static
+         ]
+         [ run system_error_test.cpp
+            :  :  : <define>BOOST_SYSTEM_DYN_LINK 
+                  : system_error_test_dll
+         ]
+         ;