diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp
index 152435fc..5299c98c 100644
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -163,10 +163,13 @@ extern "C" char *gets (char *__s);
 #endif
 //
 // Early clang versions can handle <chrono>, not exactly sure which versions
-// but certainly up to clang-3.4 and gcc-4.6:
+// but certainly up to clang-3.8 and gcc-4.6:
 //
-#if (__clang_major__ < 3) || ((__clang_major__ == 3) && (__clang_minor__ < 5))
-#  if BOOST_LIBSTDCXX_VERSION < 50000
+#if (__clang_major__ < 5)
+#  if BOOST_LIBSTDCXX_VERSION < 40800
+#     define BOOST_NO_CXX11_HDR_FUTURE
+#     define BOOST_NO_CXX11_HDR_MUTEX
+#     define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
 #     define BOOST_NO_CXX11_HDR_CHRONO
 #  endif
 #endif