diff --git a/CMakeLists.txt b/CMakeLists.txt
index fabddbb..73434d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,17 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    intrusive_ptr.hpp
+    intrusive
+)
 
 # Add a library target to the build system
 boost_library_project(
   intrusive
   #  SRCDIRS 
-  TESTDIRS test
-  HEADERS intrusive_ptr.hpp intrusive
+  #  TESTDIRS 
+  HEADERS ${lib_headers}
   #  DOCDIRS 
   #  DESCRIPTION 
   MODULARIZED 
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 0201f8a..f00fe39 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -55,5 +55,4 @@ boostbook standalone
         <xsl:param>generate.section.toc.level=3
         <xsl:param>chunk.first.sections=1
         <dependency>autodoc
-        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
    ;
diff --git a/doc/intrusive.qbk b/doc/intrusive.qbk
index 69f11cd..cb642f1 100644
--- a/doc/intrusive.qbk
+++ b/doc/intrusive.qbk
@@ -3703,6 +3703,15 @@ all the objects to be inserted in intrusive containers in containers like `std::
 
 [section:release_notes Release Notes]
 
+[section:release_notes_boost_1_40_00 Boost 1.40 Release]
+
+*  Code cleanup in tree_algorithms.hpp and avl_tree_algorithms.hpp
+*  Fixed bug
+  [@https://svn.boost.org/trac/boost/ticket/3164 #3164].
+
+[endsect]
+
+
 [section:release_notes_boost_1_39_00 Boost 1.39 Release]
 
 *  Optimized `list::merge` and `slist::merge`
diff --git a/example/doc_avl_set.cpp b/example/doc_avl_set.cpp
index 32d339b..985c136 100644
--- a/example/doc_avl_set.cpp
+++ b/example/doc_avl_set.cpp
@@ -34,7 +34,7 @@ class MyClass : public avl_set_base_hook<optimize_size<true> >
    friend bool operator> (const MyClass &a, const MyClass &b)
       {  return a.int_ > b.int_;  }
    friend bool operator== (const MyClass &a, const MyClass &b)
-      {  return a.int_ < b.int_;  }
+      {  return a.int_ == b.int_;  }
 };
 
 //Define an avl_set using the base hook that will store values in reverse order
diff --git a/example/doc_set.cpp b/example/doc_set.cpp
index c996038..49fbe9c 100644
--- a/example/doc_set.cpp
+++ b/example/doc_set.cpp
@@ -34,7 +34,7 @@ class MyClass : public set_base_hook<optimize_size<true> >
    friend bool operator> (const MyClass &a, const MyClass &b)
       {  return a.int_ > b.int_;  }
    friend bool operator== (const MyClass &a, const MyClass &b)
-      {  return a.int_ < b.int_;  }
+      {  return a.int_ == b.int_;  }
 };
 
 //Define a set using the base hook that will store values in reverse order
diff --git a/example/doc_sg_set.cpp b/example/doc_sg_set.cpp
index aa33258..5885b0e 100644
--- a/example/doc_sg_set.cpp
+++ b/example/doc_sg_set.cpp
@@ -33,7 +33,7 @@ class MyClass : public bs_set_base_hook<>
    friend bool operator> (const MyClass &a, const MyClass &b)
       {  return a.int_ > b.int_;  }
    friend bool operator== (const MyClass &a, const MyClass &b)
-      {  return a.int_ < b.int_;  }
+      {  return a.int_ == b.int_;  }
 };
 
 //Define an sg_set using the base hook that will store values in reverse order
diff --git a/example/doc_splay_set.cpp b/example/doc_splay_set.cpp
index 8859165..87ed7e0 100644
--- a/example/doc_splay_set.cpp
+++ b/example/doc_splay_set.cpp
@@ -36,7 +36,7 @@ class MyClass
    friend bool operator> (const MyClass &a, const MyClass &b)
       {  return a.int_ > b.int_;  }
    friend bool operator== (const MyClass &a, const MyClass &b)
-      {  return a.int_ < b.int_;  }
+      {  return a.int_ == b.int_;  }
 };
 
 //Define a set using the base hook that will store values in reverse order
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 18326bb..0000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Boost Intrusive Library Test Jamfile
-#  (C) Copyright Ion Gaztanaga 2006.
-# 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)
-
-# Adapted from John Maddock's TR1 Jamfile.v2
-# Copyright John Maddock 2005.
-# 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)
-
-# this rule enumerates through all the sources and invokes
-# the run rule for each source, the result is a list of all
-# the run rules, which we can pass on to the test_suite rule:
-
-file(GLOB SRCFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-
-foreach(testfile ${SRCFILES})
-  get_filename_component(testname ${testfile} NAME_WE)
-  boost_test_run(${testname})
-endforeach()
-
diff --git a/test/avl_set_test.cpp b/test/avl_set_test.cpp
index 55e415c..8b4f16e 100644
--- a/test/avl_set_test.cpp
+++ b/test/avl_set_test.cpp
@@ -132,6 +132,7 @@ int main( int, char* [] )
    test_main_template<boost::intrusive::smart_ptr<void>, false>()();
    test_main_template<void*, true>()();
    test_main_template<boost::intrusive::smart_ptr<void>, true>()();
+
    return boost::report_errors();
 }