diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..82b6fc02
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    config.hpp
+    config
+)
+
+# Add a library target to the build system
+boost_library_project(
+  config
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "Helps Boost library developers adapt to compiler idiosyncrasies; not intended for library users."
+  MODULARIZED 
+  AUTHORS  "John Maddock <john -at- johnmaddock.co.uk>"
+  #  MAINTAINERS 
+)
+
+
diff --git a/module.cmake b/module.cmake
new file mode 100644
index 00000000..e69de29b
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644
index 00000000..d5285132
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,39 @@
+# Copyright John Maddock and Douglas Gregor.
+# Use, modification and distribution are subject to 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)
+if(MSVC)
+  set(BOOST_CONFIG_MSVC_STATIC_OPTIONS STATIC STATIC_RUNTIME)
+endif(MSVC)
+if(BORLAND)
+  set(BOOST_CONFIG_BORLAND_STATIC_OPTIONS STATIC STATIC_RUNTIME)
+endif(BORLAND)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  set(BOOST_CONFIG_STATIC_THREAD_LIBS LINK_LIBS pthread rt)
+endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+#-------------------------------------------------------------------------
+#-- Needed include directories for the tests
+boost_test_add_dependent_includes("utility;detail;config;test;preprocessor;type_traits;smart_ptr;mpl;exception;static_assert")
+#-------------------------------------------------------------------------
+
+boost_test_run(config_test_threaded config_test.cpp 
+  EXTRA_OPTIONS MULTI_THREADED)
+boost_test_run(config_test 
+  EXTRA_OPTIONS SINGLE_THREADED ${BOOST_CONFIG_MSVC_STATIC_OPTIONS}
+                ${BOOST_CONFIG_STATIC_THREAD_LIBS})
+boost_test_run(config_info_threaded config_info.cpp 
+  EXTRA_OPTIONS MULTI_THREADED)
+boost_test_run(config_info
+  EXTRA_OPTIONS SINGLE_THREADED ${BOOST_CONFIG_MSVC_STATIC_OPTIONS})
+boost_test_run(math_info
+  EXTRA_OPTIONS ${BOOST_CONFIG_BORLAND_STATIC_OPTIONS})
+  
+
+boost_test_run(limits_test DEPENDS boost_test_exec_monitor)
+boost_test_run(abi_test abi/abi_test.cpp abi/main.cpp)
+
+# TODO: config_link_test
+boost_test_compile_fail(test_thread_fail1 threads/test_thread_fail1.cpp)
+boost_test_compile_fail(test_thread_fail2 threads/test_thread_fail2.cpp)
\ No newline at end of file