diff --git a/example/executor.cpp b/example/executor.cpp
index 67baeaeb..d9b8ac2c 100644
--- a/example/executor.cpp
+++ b/example/executor.cpp
@@ -84,44 +84,52 @@ int test_executor_adaptor()
   {
     try
     {
+//      {
+//        std::cout << BOOST_CONTEXTOF << std::endl;
+//        boost::basic_thread_pool e1;
+//        std::cout << BOOST_CONTEXTOF << std::endl;
+//        boost::basic_thread_pool e2 = e1;
+//        std::cout << BOOST_CONTEXTOF << std::endl;
+//      }
       {
-        boost::basic_thread_pool e1;
-        boost::basic_thread_pool e2 = e1;
-      }
-      {
+        std::cout << BOOST_CONTEXTOF << std::endl;
         boost::executor_adaptor < boost::basic_thread_pool > ea(4);
         std::cout << BOOST_CONTEXTOF << std::endl;
         submit_some( ea);
         std::cout << BOOST_CONTEXTOF << std::endl;
+      }
 #if 1
+      {
+        std::cout << BOOST_CONTEXTOF << std::endl;
+        boost::executor_adaptor < boost::basic_thread_pool > ea(4);
       // fixme
       // ERROR= tr1::bad_weak_ptr
-        {
-          boost::future<int> t1 = boost::async(ea, &f1);
-          boost::future<int> t2 = boost::async(ea, &f1);
-          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
+//        {
+//          boost::future<int> t1 = boost::async(ea, &f1);
+//          boost::future<int> t2 = boost::async(ea, &f1);
+//          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
         std::cout << BOOST_CONTEXTOF << std::endl;
         submit_some(ea);
-        std::cout << BOOST_CONTEXTOF << std::endl;
-        {
-          boost::basic_thread_pool ea3(1);
-          std::cout << BOOST_CONTEXTOF << std::endl;
-          boost::future<int> t1 = boost::async(ea3, &f1);
-          std::cout << BOOST_CONTEXTOF << std::endl;
-          boost::future<int> t2 = boost::async(ea3, &f1);
-          std::cout << BOOST_CONTEXTOF << std::endl;
-          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
-          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
-          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
-#endif
+//        std::cout << BOOST_CONTEXTOF << std::endl;
+//        {
+//          boost::basic_thread_pool ea3(1);
+//          std::cout << BOOST_CONTEXTOF << std::endl;
+//          boost::future<int> t1 = boost::async(ea3, &f1);
+//          std::cout << BOOST_CONTEXTOF << std::endl;
+//          boost::future<int> t2 = boost::async(ea3, &f1);
+//          std::cout << BOOST_CONTEXTOF << std::endl;
+//          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
+//          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
+//          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
         std::cout << BOOST_CONTEXTOF << std::endl;
         submit_some(ea);
         std::cout << BOOST_CONTEXTOF << std::endl;
       }
+#endif
       std::cout << BOOST_CONTEXTOF << std::endl;
       {
         boost::loop_executor e1;
@@ -187,7 +195,7 @@ int test_executor_adaptor()
         submit_some(ea1);
       }
       std::cout << BOOST_CONTEXTOF << std::endl;
-#if 1
+#if 0
       // fixme
       // ERROR= tr1::bad_weak_ptr
       {
@@ -200,7 +208,7 @@ int test_executor_adaptor()
       {
         boost::async(&f1);
       }
-#if 1
+#if 0
       // fixme
       // ERROR= tr1::bad_weak_ptr
 
diff --git a/example/generic_executor.cpp b/example/generic_executor.cpp
index 67429b5e..fc69e76c 100644
--- a/example/generic_executor.cpp
+++ b/example/generic_executor.cpp
@@ -105,22 +105,22 @@ int test_generic_executor()
       {
         boost::basic_thread_pool ea(4);
         submit_some( ea);
-        {
-          boost::future<int> t1 = boost::async(ea, &f1);
-          boost::future<int> t2 = boost::async(ea, &f1);
-          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
+//        {
+//          boost::future<int> t1 = boost::async(ea, &f1);
+//          boost::future<int> t2 = boost::async(ea, &f1);
+//          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
         submit_some(ea);
-        {
-          boost::basic_thread_pool ea3(1);
-          boost::future<int> t1 = boost::async(ea3, &f1);
-          boost::future<int> t2 = boost::async(ea3, &f1);
-          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
-          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
-          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
+//        {
+//          boost::basic_thread_pool ea3(1);
+//          boost::future<int> t1 = boost::async(ea3, &f1);
+//          boost::future<int> t2 = boost::async(ea3, &f1);
+//          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
+//          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
+//          // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          // std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
         submit_some(ea);
       }
       // std::cout << BOOST_CONTEXTOF << std::endl;
@@ -154,11 +154,11 @@ int test_generic_executor()
         //submit_some(ea1);
       }
       // std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool  ea(4, at_th_entry);
-        boost::future<int> t1 = boost::async(ea, &f1);
-        // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-      }
+//      {
+//        boost::basic_thread_pool  ea(4, at_th_entry);
+//        boost::future<int> t1 = boost::async(ea, &f1);
+//        // std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//      }
     }
     catch (std::exception& ex)
     {
diff --git a/example/generic_executor_ref.cpp b/example/generic_executor_ref.cpp
index 7090bb6d..00425d77 100644
--- a/example/generic_executor_ref.cpp
+++ b/example/generic_executor_ref.cpp
@@ -81,22 +81,22 @@ int test_generic_executor_ref()
       {
         boost::basic_thread_pool ea(4);
         submit_some( ea);
-        {
-          boost::future<int> t1 = boost::async(ea, &f1);
-          boost::future<int> t2 = boost::async(ea, &f1);
-          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
-        submit_some(ea);
-        {
-          boost::basic_thread_pool ea3(1);
-          boost::future<int> t1 = boost::async(ea3, &f1);
-          boost::future<int> t2 = boost::async(ea3, &f1);
-          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
-          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
-          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
-        }
+//        {
+//          boost::future<int> t1 = boost::async(ea, &f1);
+//          boost::future<int> t2 = boost::async(ea, &f1);
+//          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
+//        submit_some(ea);
+//        {
+//          boost::basic_thread_pool ea3(1);
+//          boost::future<int> t1 = boost::async(ea3, &f1);
+//          boost::future<int> t2 = boost::async(ea3, &f1);
+//          //boost::future<int> t2 = boost::async(ea3, f2, 1); // todo this doesn't compiles yet on C++11
+//          //boost::future<int> t2 = boost::async(ea3, boost::bind(f2, 1)); // todo this doesn't compiles yet on C++98
+//          std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//          std::cout << BOOST_CONTEXTOF << " t2= " << t2.get() << std::endl;
+//        }
         submit_some(ea);
       }
       std::cout << BOOST_CONTEXTOF << std::endl;
@@ -123,18 +123,18 @@ int test_generic_executor_ref()
         //boost::thread_executor ea1;
         //submit_some(ea1);
       }
-      std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool  ea(4, at_th_entry);
-        boost::future<int> t1 = boost::async(ea, &f1);
-        std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
-      }
-      std::cout << BOOST_CONTEXTOF << std::endl;
-      {
-        boost::basic_thread_pool  ea(4, at_th_entry);
-        boost::async(ea, &f1);
-        std::cout << BOOST_CONTEXTOF << std::endl;
-      }
+//      std::cout << BOOST_CONTEXTOF << std::endl;
+//      {
+//        boost::basic_thread_pool  ea(4, at_th_entry);
+//        boost::future<int> t1 = boost::async(ea, &f1);
+//        std::cout << BOOST_CONTEXTOF << " t1= " << t1.get() << std::endl;
+//      }
+//      std::cout << BOOST_CONTEXTOF << std::endl;
+//      {
+//        boost::basic_thread_pool  ea(4, at_th_entry);
+//        boost::async(ea, &f1);
+//        std::cout << BOOST_CONTEXTOF << std::endl;
+//      }
       std::cout << BOOST_CONTEXTOF << std::endl;
       boost::this_thread::sleep_for(boost::chrono::milliseconds(200));
       std::cout << BOOST_CONTEXTOF << std::endl;
diff --git a/example/generic_serial_executor_cont.cpp b/example/generic_serial_executor_cont.cpp
index f39ad46b..3368928f 100644
--- a/example/generic_serial_executor_cont.cpp
+++ b/example/generic_serial_executor_cont.cpp
@@ -78,23 +78,29 @@ int test_executor_adaptor()
   std::cout << BOOST_CONTEXTOF << std::endl;
   {
      boost::basic_thread_pool tp;
+     std::cout << BOOST_CONTEXTOF << std::endl;
      boost::generic_serial_executor_cont e1(tp);
+     std::cout << BOOST_CONTEXTOF << std::endl;
      boost::generic_serial_executor_cont e2 = e1;
+     std::cout << BOOST_CONTEXTOF << std::endl;
   }
-  // std::cout << BOOST_CONTEXTOF << std::endl;
+   std::cout << BOOST_CONTEXTOF << std::endl;
   {
     try
     {
 
 #if ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-      // std::cout << BOOST_CONTEXTOF << std::endl;
+       std::cout << BOOST_CONTEXTOF << std::endl;
       {
         boost::basic_thread_pool ea1(4);
+        std::cout << BOOST_CONTEXTOF << std::endl;
         boost::generic_serial_executor_cont ea2(ea1);
+        std::cout << BOOST_CONTEXTOF << std::endl;
         submit_some(ea2);
+        std::cout << BOOST_CONTEXTOF << std::endl;
       }
 #endif
-      // std::cout << BOOST_CONTEXTOF << std::endl;
+      std::cout << BOOST_CONTEXTOF << std::endl;
     }
     catch (std::exception& ex)
     {
diff --git a/example/tennis.cpp b/example/tennis.cpp
index 61d49b27..d560ecb9 100644
--- a/example/tennis.cpp
+++ b/example/tennis.cpp
@@ -50,7 +50,7 @@ void player(int active)
 
     while (state < GAME_OVER)
     {
-        std::cout << player_name(active) << ": Play." << std::endl;
+        //std::cout << player_name(active) << ": Play." << std::endl;
         state = other;
         cond.notify_all();
         do
diff --git a/include/boost/thread/executors/basic_thread_pool.hpp b/include/boost/thread/executors/basic_thread_pool.hpp
index 4bc2b06a..0c8e282c 100644
--- a/include/boost/thread/executors/basic_thread_pool.hpp
+++ b/include/boost/thread/executors/basic_thread_pool.hpp
@@ -87,6 +87,7 @@ namespace executors
           {
             this_thread::yield();
           }
+      }
     private:
 
       /**
diff --git a/include/boost/thread/executors/generic_serial_executor.hpp b/include/boost/thread/executors/generic_serial_executor.hpp
index efa9077a..223f4ad9 100644
--- a/include/boost/thread/executors/generic_serial_executor.hpp
+++ b/include/boost/thread/executors/generic_serial_executor.hpp
@@ -41,7 +41,8 @@ namespace executors
 
     struct shared_state {
       typedef  executors::work work;
-      typedef  scoped_thread<> thread_t;
+      typedef thread thread_t;
+      //typedef  scoped_thread<> thread_t;
 
       /// the thread safe work queue
       concurrent::sync_queue<work > work_queue;
@@ -121,6 +122,16 @@ namespace executors
       {
         // signal to the worker thread that there will be no more submissions.
         close();
+        join();
+      }
+
+      /**
+       * \b Effects: join all the threads.
+       */
+      void join()
+      {
+          if (this_thread::get_id() == thr.get_id()) return;
+          thr.join();
       }
 
       /**
diff --git a/include/boost/thread/executors/serial_executor.hpp b/include/boost/thread/executors/serial_executor.hpp
index 3ad3fadb..a76bb677 100644
--- a/include/boost/thread/executors/serial_executor.hpp
+++ b/include/boost/thread/executors/serial_executor.hpp
@@ -37,7 +37,8 @@ namespace executors
 
     struct shared_state {
       typedef  executors::work work;
-      typedef  scoped_thread<> thread_t;
+      //typedef  scoped_thread<> thread_t;
+      typedef thread thread_t;
 
       /// the thread safe work queue
       concurrent::sync_queue<work > work_queue;
@@ -116,6 +117,7 @@ namespace executors
       {
         // signal to the worker thread that there will be no more submissions.
         close();
+        thr.join();
       }
 
       /**
diff --git a/include/boost/thread/executors/thread_executor.hpp b/include/boost/thread/executors/thread_executor.hpp
index e2e0b001..afba8d88 100644
--- a/include/boost/thread/executors/thread_executor.hpp
+++ b/include/boost/thread/executors/thread_executor.hpp
@@ -37,7 +37,8 @@ namespace executors
     struct shared_state {
       typedef  executors::work work;
       bool closed_;
-      typedef scoped_thread<> thread_t;
+      //typedef scoped_thread<> thread_t;
+      typedef thread thread_t;
       typedef csbl::vector<thread_t> threads_type;
       threads_type threads_;
       mutable mutex mtx_;
@@ -64,6 +65,19 @@ namespace executors
         // signal to all the worker thread that there will be no more submissions.
         close();
         // all the scoped threads will join before destroying
+        join();
+      }
+
+      /**
+       * \b Effects: join all the threads.
+       */
+      void join()
+      {
+        for (unsigned i = 0; i < threads_.size(); ++i)
+        {
+          if (this_thread::get_id() == threads_[i].get_id()) continue;
+          threads_[i].join();
+        }
       }
 
       /**
diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
index d457ed1d..aecbf4b2 100644
--- a/include/boost/thread/future.hpp
+++ b/include/boost/thread/future.hpp
@@ -3745,7 +3745,8 @@ namespace detail {
       }
 #endif
       void operator()() {
-        shared_state<Rp>* that_ = dynamic_cast<shared_state<Rp>*>(that.get());
+        shared_ptr<shared_state<Rp>> that_ = dynamic_pointer_cast<shared_state<Rp>>(that);
+        if (! that) return;
         try {
           that_->mark_finished_with_result(f_());
         } catch(...) {
@@ -3795,7 +3796,8 @@ namespace detail {
       }
 #endif
       void operator()() {
-        shared_state<void>* that_ = dynamic_cast<shared_state<void>*>(that.get());
+        shared_ptr<shared_state<void>> that_ = dynamic_pointer_cast<shared_state<void>>(that);
+        if (! that) return;
         try {
           f_();
           that_->mark_finished_with_result();
@@ -3842,7 +3844,8 @@ namespace detail {
       }
 #endif
       void operator()() {
-        shared_state<Rp&>* that_ = dynamic_cast<shared_state<Rp&>*>(that.get());
+        shared_ptr<shared_state<Rp&>> that_ = dynamic_pointer_cast<shared_state<Rp&>>(that);
+        if (! that) return;
         try {
           that_->mark_finished_with_result(f_());
         } catch(...) {
diff --git a/include/boost/thread/latch.hpp b/include/boost/thread/latch.hpp
index 8fa9d963..dc921e68 100644
--- a/include/boost/thread/latch.hpp
+++ b/include/boost/thread/latch.hpp
@@ -72,6 +72,7 @@ namespace boost
     void wait()
     {
       boost::unique_lock<boost::mutex> lk(mutex_);
+      if (count_ == 0) return;
       std::size_t generation(generation_);
       cond_.wait(lk, detail::not_equal(generation, generation_));
     }
@@ -89,6 +90,7 @@ namespace boost
     cv_status wait_for(const chrono::duration<Rep, Period>& rel_time)
     {
       boost::unique_lock<boost::mutex> lk(mutex_);
+      if (count_ == 0) return cv_status::no_timeout;
       std::size_t generation(generation_);
       return cond_.wait_for(lk, rel_time, detail::not_equal(generation, generation_))
               ? cv_status::no_timeout
@@ -101,6 +103,7 @@ namespace boost
     cv_status wait_until(const chrono::time_point<Clock, Duration>& abs_time)
     {
       boost::unique_lock<boost::mutex> lk(mutex_);
+      if (count_ == 0) return cv_status::no_timeout;
       std::size_t generation(generation_);
       return cond_.wait_until(lk, abs_time, detail::not_equal(generation, generation_))
           ? cv_status::no_timeout
diff --git a/include/boost/thread/pthread/condition_variable_fwd.hpp b/include/boost/thread/pthread/condition_variable_fwd.hpp
index 29efa876..598ff811 100644
--- a/include/boost/thread/pthread/condition_variable_fwd.hpp
+++ b/include/boost/thread/pthread/condition_variable_fwd.hpp
@@ -62,7 +62,23 @@ namespace boost
                 boost::throw_exception(thread_resource_error(res, "boost::condition_variable::condition_variable() constructor failed in pthread_mutex_init"));
             }
 #endif
+
+#ifdef BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC
+            pthread_condattr_t attr;
+            int res2 = pthread_condattr_init(&attr);
+            if(res2)
+            {
+  #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                BOOST_VERIFY(!pthread_mutex_destroy(&internal_mutex));
+  #endif
+                boost::throw_exception(thread_resource_error(res2, "boost::condition_variable_steady::condition_variable_steady() constructor failed in pthread_condattr_init"));
+            }
+            pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
+            res2=pthread_cond_init(&cond,&attr);
+            pthread_condattr_destroy(&attr);
+#else
             int const res2=pthread_cond_init(&cond,NULL);
+#endif
             if(res2)
             {
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
@@ -94,7 +110,6 @@ namespace boost
             while(!pred()) wait(m);
         }
 
-
 #if defined BOOST_THREAD_USES_DATETIME
         inline bool timed_wait(
             unique_lock<mutex>& m,
@@ -174,6 +189,8 @@ namespace boost
         }
 #endif
 
+#ifndef BOOST_THREAD_HAS_CONDATTR_SET_CLOCK_MONOTONIC
+
 #ifdef BOOST_THREAD_USES_CHRONO
 
         template <class Duration>
@@ -203,20 +220,6 @@ namespace boost
           return Clock::now() < t ? cv_status::no_timeout : cv_status::timeout;
         }
 
-        template <class Clock, class Duration, class Predicate>
-        bool
-        wait_until(
-                unique_lock<mutex>& lock,
-                const chrono::time_point<Clock, Duration>& t,
-                Predicate pred)
-        {
-            while (!pred())
-            {
-                if (wait_until(lock, t) == cv_status::timeout)
-                    return pred();
-            }
-            return true;
-        }
 
 
         template <class Rep, class Period>
@@ -234,6 +237,90 @@ namespace boost
 
         }
 
+        inline cv_status wait_until(
+            unique_lock<mutex>& lk,
+            chrono::time_point<chrono::system_clock, chrono::nanoseconds> tp)
+        {
+            using namespace chrono;
+            nanoseconds d = tp.time_since_epoch();
+            timespec ts = boost::detail::to_timespec(d);
+            if (do_wait_until(lk, ts)) return cv_status::no_timeout;
+            else return cv_status::timeout;
+        }
+#endif
+
+#else
+#ifdef BOOST_THREAD_USES_CHRONO
+
+        template <class Duration>
+        cv_status
+        wait_until(
+              unique_lock<mutex>& lock,
+              const chrono::time_point<chrono::steady_clock, Duration>& t)
+        {
+            using namespace chrono;
+            typedef time_point<steady_clock, nanoseconds> nano_sys_tmpt;
+            wait_until(lock,
+                        nano_sys_tmpt(ceil<nanoseconds>(t.time_since_epoch())));
+            return steady_clock::now() < t ? cv_status::no_timeout :
+                                             cv_status::timeout;
+        }
+
+        template <class Clock, class Duration>
+        cv_status
+        wait_until(
+            unique_lock<mutex>& lock,
+            const chrono::time_point<Clock, Duration>& t)
+        {
+            using namespace chrono;
+            steady_clock::time_point     s_now = steady_clock::now();
+            typename Clock::time_point  c_now = Clock::now();
+            wait_until(lock, s_now + ceil<nanoseconds>(t - c_now));
+            return Clock::now() < t ? cv_status::no_timeout : cv_status::timeout;
+        }
+
+        template <class Rep, class Period>
+        cv_status
+        wait_for(
+            unique_lock<mutex>& lock,
+            const chrono::duration<Rep, Period>& d)
+        {
+            using namespace chrono;
+            steady_clock::time_point c_now = steady_clock::now();
+            wait_until(lock, c_now + ceil<nanoseconds>(d));
+            return steady_clock::now() - c_now < d ? cv_status::no_timeout :
+                                                   cv_status::timeout;
+        }
+
+        inline cv_status wait_until(
+            unique_lock<mutex>& lk,
+            chrono::time_point<chrono::steady_clock, chrono::nanoseconds> tp)
+        {
+            using namespace chrono;
+            nanoseconds d = tp.time_since_epoch();
+            timespec ts = boost::detail::to_timespec(d);
+            if (do_wait_until(lk, ts)) return cv_status::no_timeout;
+            else return cv_status::timeout;
+        }
+#endif
+
+#endif
+
+#ifdef BOOST_THREAD_USES_CHRONO
+        template <class Clock, class Duration, class Predicate>
+        bool
+        wait_until(
+                unique_lock<mutex>& lock,
+                const chrono::time_point<Clock, Duration>& t,
+                Predicate pred)
+        {
+            while (!pred())
+            {
+                if (wait_until(lock, t) == cv_status::timeout)
+                    return pred();
+            }
+            return true;
+        }
 
         template <class Rep, class Period, class Predicate>
         bool
@@ -263,18 +350,7 @@ namespace boost
         void notify_one() BOOST_NOEXCEPT;
         void notify_all() BOOST_NOEXCEPT;
 
-#ifdef BOOST_THREAD_USES_CHRONO
-        inline cv_status wait_until(
-            unique_lock<mutex>& lk,
-            chrono::time_point<chrono::system_clock, chrono::nanoseconds> tp)
-        {
-            using namespace chrono;
-            nanoseconds d = tp.time_since_epoch();
-            timespec ts = boost::detail::to_timespec(d);
-            if (do_wait_until(lk, ts)) return cv_status::no_timeout;
-            else return cv_status::timeout;
-        }
-#endif
+
     };
 
     BOOST_THREAD_DECL void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
diff --git a/include/boost/thread/win32/shared_mutex.hpp b/include/boost/thread/win32/shared_mutex.hpp
index fff97b73..27677abd 100644
--- a/include/boost/thread/win32/shared_mutex.hpp
+++ b/include/boost/thread/win32/shared_mutex.hpp
@@ -139,10 +139,11 @@ namespace boost
 
         void lock_shared()
         {
-#if defined BOOST_THREAD_USES_DATETIME
-            BOOST_VERIFY(timed_lock_shared(::boost::detail::get_system_time_sentinel()));
-#else
+#ifdef BOOST_THREAD_USES_CHRONO
             BOOST_VERIFY(try_lock_shared_until(chrono::steady_clock::now()));
+#else
+            //#if defined BOOST_THREAD_USES_DATETIME
+            BOOST_VERIFY(timed_lock_shared(::boost::detail::get_system_time_sentinel()));
 #endif
         }
 
@@ -389,10 +390,12 @@ namespace boost
 
         void lock()
         {
-#if defined BOOST_THREAD_USES_DATETIME
-            BOOST_VERIFY(timed_lock(::boost::detail::get_system_time_sentinel()));
-#else
+
+#ifdef BOOST_THREAD_USES_CHRONO
             BOOST_VERIFY(try_lock_until(chrono::steady_clock::now()));
+#else
+            //#if defined BOOST_THREAD_USES_DATETIME
+            BOOST_VERIFY(timed_lock(::boost::detail::get_system_time_sentinel()));
 #endif
         }
 
diff --git a/include/boost/thread/win32/thread_data.hpp b/include/boost/thread/win32/thread_data.hpp
index 51f6273f..005f3ba5 100644
--- a/include/boost/thread/win32/thread_data.hpp
+++ b/include/boost/thread/win32/thread_data.hpp
@@ -280,12 +280,13 @@ namespace boost
         {
             interruptible_wait(abs_time);
         }
-#ifdef BOOST_THREAD_USES_CHRONO
-        inline void BOOST_SYMBOL_VISIBLE sleep_for(const chrono::nanoseconds& ns)
-        {
-          interruptible_wait(chrono::duration_cast<chrono::milliseconds>(ns).count());
-        }
-#endif
+// #11322   sleep_for() nanoseconds overload will always return too early on windows
+//#ifdef BOOST_THREAD_USES_CHRONO
+//        inline void BOOST_SYMBOL_VISIBLE sleep_for(const chrono::nanoseconds& ns)
+//        {
+//          interruptible_wait(chrono::duration_cast<chrono::milliseconds>(ns).count());
+//        }
+//#endif
         namespace no_interruption_point
         {
           bool BOOST_THREAD_DECL non_interruptible_wait(detail::win32::handle handle_to_wait_for,detail::timeout target_time);
@@ -306,12 +307,13 @@ namespace boost
           {
             non_interruptible_wait(abs_time);
           }
-#ifdef BOOST_THREAD_USES_CHRONO
-          inline void BOOST_SYMBOL_VISIBLE sleep_for(const chrono::nanoseconds& ns)
-          {
-            non_interruptible_wait(chrono::duration_cast<chrono::milliseconds>(ns).count());
-          }
-#endif
+// #11322   sleep_for() nanoseconds overload will always return too early on windows
+//#ifdef BOOST_THREAD_USES_CHRONO
+//          inline void BOOST_SYMBOL_VISIBLE sleep_for(const chrono::nanoseconds& ns)
+//          {
+//            non_interruptible_wait(chrono::duration_cast<chrono::milliseconds>(ns).count());
+//          }
+//#endif
         }
     }
 
diff --git a/src/pthread/once.cpp b/src/pthread/once.cpp
index f61d74c8..7748d086 100644
--- a/src/pthread/once.cpp
+++ b/src/pthread/once.cpp
@@ -15,9 +15,9 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <memory>
-#if defined BOOST_THREAD_PATCH
+//#if defined BOOST_THREAD_PATCH
 #include <string.h> // memcmp.
-#endif
+//#endif
 namespace boost
 {
     namespace thread_detail
@@ -44,7 +44,7 @@ namespace boost
                 }
             }
 
-#if defined BOOST_THREAD_PATCH
+//#if defined BOOST_THREAD_PATCH
             const pthread_once_t pthread_once_init_value=PTHREAD_ONCE_INIT;
             struct BOOST_THREAD_DECL delete_epoch_tss_key_on_dlclose_t
             {
@@ -60,7 +60,7 @@ namespace boost
                 }
             };
             delete_epoch_tss_key_on_dlclose_t delete_epoch_tss_key_on_dlclose;
-#endif
+//#endif
         }
 
         uintmax_atomic_t& get_once_per_thread_epoch()
diff --git a/src/pthread/thread.cpp b/src/pthread/thread.cpp
index aa29615d..c3fdff7b 100644
--- a/src/pthread/thread.cpp
+++ b/src/pthread/thread.cpp
@@ -35,6 +35,7 @@
 #include <string>
 #include <set>
 #include <vector>
+#include <string.h> // memcmp.
 
 namespace boost
 {
@@ -117,7 +118,7 @@ namespace boost
                 }
             }
 
-#if defined BOOST_THREAD_PATCH
+//#if defined BOOST_THREAD_PATCH
 
             struct  delete_current_thread_tls_key_on_dlclose_t
             {
@@ -134,7 +135,7 @@ namespace boost
                 }
             };
             delete_current_thread_tls_key_on_dlclose_t delete_current_thread_tls_key_on_dlclose;
-#endif
+//#endif
 
             void create_current_thread_tls_key()
             {
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 1df9f96e..209db2d2 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -973,7 +973,9 @@ rule thread-compile ( sources : reqs * : name )
           #[ thread-run2 ../example/parallel_accumulate.cpp : ex_parallel_accumulate2 ]
           #[ thread-run test_11256.cpp ]
           #[ thread-run test_11499.cpp ]
-          [ thread-run test_11611.cpp ]
+          #[ thread-run test_11611.cpp ]
+          #[ thread-run test_11633.cpp ]
+          
     ;