diff --git a/doc/addressof.qbk b/doc/addressof.qbk
index 8c9cb5e..b0234ec 100644
--- a/doc/addressof.qbk
+++ b/doc/addressof.qbk
@@ -14,6 +14,7 @@
 * Brad King
 * Douglas Gregor
 * Peter Dimov
+* Glen Fernandes
 
 [endsimplesect]
 
@@ -28,6 +29,15 @@ avoids calling used-defined `operator&()`.
 `boost::addressof` was originally contributed by Brad King
 based on ideas from discussion with Doug Gregor.
 
+In C++11 and above, `boost::addressof` is conditionally
+`constexpr` when possible. This is indicated by
+`BOOST_CORE_NO_CONSTEXPR_ADDRESSOF` not being defined.
+
+With supported compilers, `boost::addressof` is always
+`constexpr` by leveraging compiler intrinsics. This is
+indicated by `BOOST_CORE_HAS_BUILTIN_ADDRESSOF` being
+defined.
+
 [section Synopsis]
 
 ``