diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp
index ab5d1235..66642e72 100644
--- a/include/boost/config/stdlib/libcpp.hpp
+++ b/include/boost/config/stdlib/libcpp.hpp
@@ -53,6 +53,9 @@
 #  define BOOST_NO_CXX11_HDR_FUNCTIONAL
 #  define BOOST_NO_CXX11_STD_ALIGN
 #  define BOOST_NO_CXX11_ADDRESSOF
+#  if _LIBCPP_VERSION < 3700
+#    define BOOST_NO_CXX11_HDR_ATOMIC
+#  endif
 #endif
 
 //
@@ -62,7 +65,6 @@
 #  define BOOST_NO_CXX11_HDR_FUTURE
 #  define BOOST_NO_CXX11_HDR_TYPE_TRAITS
 #  define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-#  define BOOST_NO_CXX11_HDR_ATOMIC
 
 // libc++ uses a non-standard messages_base
 #define BOOST_NO_STD_MESSAGES