diff --git a/contrib/eos_portable_archive/eos/portable_iarchive.hpp b/contrib/eos_portable_archive/eos/portable_iarchive.hpp
index 67763f22..5d34b1d1 100644
--- a/contrib/eos_portable_archive/eos/portable_iarchive.hpp
+++ b/contrib/eos_portable_archive/eos/portable_iarchive.hpp
@@ -116,14 +116,15 @@
 #include <boost/math/fpclassify.hpp>
 #elif BOOST_VERSION < 104800
 #include <boost/spirit/home/support/detail/integer/endian.hpp>
+// Boost 1.69 (Spirit.X2/X3) has dropped their own FP routines in favor of boost::math
+#elif BOOST_VERSION < 106900
 #include <boost/spirit/home/support/detail/math/fpclassify.hpp>
 #else
 #include <boost/spirit/home/support/detail/endian/endian.hpp>
-#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
 #endif
 
 // namespace alias
-#if BOOST_VERSION < 103800
+#if BOOST_VERSION < 103800 || BOOST_VERSION >= 106900
 namespace fp = boost::math;
 #else
 namespace fp = boost::spirit::math;
diff --git a/contrib/eos_portable_archive/eos/portable_oarchive.hpp b/contrib/eos_portable_archive/eos/portable_oarchive.hpp
index 01fc4497..ca94858b 100644
--- a/contrib/eos_portable_archive/eos/portable_oarchive.hpp
+++ b/contrib/eos_portable_archive/eos/portable_oarchive.hpp
@@ -119,14 +119,15 @@
 #include <boost/math/fpclassify.hpp>
 #elif BOOST_VERSION < 104800
 #include <boost/spirit/home/support/detail/integer/endian.hpp>
+// Boost 1.69 (Spirit.X2/X3) has dropped their own FP routines in favor of boost::math
+#elif BOOST_VERSION < 106900
 #include <boost/spirit/home/support/detail/math/fpclassify.hpp>
 #else
 #include <boost/spirit/home/support/detail/endian/endian.hpp>
-#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
 #endif
 
 // namespace alias fp_classify
-#if BOOST_VERSION < 103800
+#if BOOST_VERSION < 103800 || BOOST_VERSION >= 106900
 namespace fp = boost::math;
 #else
 namespace fp = boost::spirit::math;