diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 12523c8abd..07fa4364b5 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -60,6 +60,8 @@ boostbook doc
     #<dependency>../libs/spirit/doc//spirit
     <dependency>../libs/heap/doc//autodoc.xml
     <dependency>../libs/heap/doc//heap
+    <dependency>../libs/lockfree/doc//autodoc.xml
+    <dependency>../libs/lockfree/doc//lockfree
 
     ## Add path references to the QuickBook generated docs...
 
@@ -90,6 +92,7 @@ boostbook doc
     <implicit-dependency>../libs/random/doc//random
     #<implicit-dependency>../libs/spirit/doc//spirit
     <implicit-dependency>../libs/heap/doc//heap
+    <implicit-dependency>../libs/lockfree/doc//lockfree
 
     <xsl:param>boost.libraries=../../libs/libraries.htm
 
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 5f2695eaee..cb4ea234c6 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -372,6 +372,8 @@
 
    <xi:include href="lexical_cast.xml"/>
 
+   <xi:include href="lockfree.xml"/>
+
    <library name="Math" dirname="math" html-only="1">
      <libraryinfo>
        <author>
diff --git a/libs/maintainers.txt b/libs/maintainers.txt
index 58ea74259d..cccd0c9599 100644
--- a/libs/maintainers.txt
+++ b/libs/maintainers.txt
@@ -57,6 +57,7 @@ lambda                Jaakko Jarvi <jarvi -at- cs.tamu.edu>
 local_function        Lorenzo Caminiti <lorcaminiti -at- gmail.com>
 locale                Artyom Beilis <artyomtnk -at- yahoo.com>
 logic                 Douglas Gregor <dgregor -at- cs.indiana.edu>
+lockfree              Tim Blechmann <tim -at- klingt.org>
 math                  Hubert Holin <Hubert.Holin -at- meteo.fr>, John Maddock <john -at- johnmaddock.co.uk>
 move                  Ion Gaztanaga <igaztanaga -at- gmail.com>
 mpl                   Aleksey Gurtovoy <agurtovoy -at- meta-comm.com>
diff --git a/status/Jamfile.v2 b/status/Jamfile.v2
index 67eda57350..ad00a8346e 100644
--- a/status/Jamfile.v2
+++ b/status/Jamfile.v2
@@ -100,6 +100,7 @@ run-tests libs :
     local_function/test         # test-suite local_function
     locale/test                 # test-suite locale
     logic/test                  # test-suite logic
+    lockfree/test               # test-suite lockfree
     math/test                   # test-suite math
     move/example                # test-suite move_example
     move/test                   # test-suite move_test