diff --git a/CHANGELOG.md b/CHANGELOG.md
index 288d241b..648b2794 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 81:
 
 * Pass string_view by value
+* better is_final on empty_base_optimization
 
 --------------------------------------------------------------------------------
 
diff --git a/include/beast/core/detail/empty_base_optimization.hpp b/include/beast/core/detail/empty_base_optimization.hpp
index a0ca4446..0640cb3a 100644
--- a/include/beast/core/detail/empty_base_optimization.hpp
+++ b/include/beast/core/detail/empty_base_optimization.hpp
@@ -8,6 +8,7 @@
 #ifndef BEAST_DETAIL_EMPTY_BASE_OPTIMIZATION_HPP
 #define BEAST_DETAIL_EMPTY_BASE_OPTIMIZATION_HPP
 
+#include <boost/type_traits/is_final.hpp>
 #include <type_traits>
 #include <utility>
 
@@ -16,12 +17,9 @@ namespace detail {
 
 template<class T>
 struct empty_base_optimization_decide
-    : std::integral_constant <bool,
-        std::is_empty <T>::value
-#ifdef __clang__
-        && !__is_final(T)
-#endif
-    >
+    : std::integral_constant<bool,
+        std::is_empty<T>::value &&
+        ! boost::is_final<T>::value>
 {
 };