diff --git a/boost-fiber-features.jam b/boost-fiber-features.jam
new file mode 100644
index 00000000..d3eba2fc
--- /dev/null
+++ b/boost-fiber-features.jam
@@ -0,0 +1,10 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import feature ;
+import os ;
+
+feature.feature numa : on : optional propagated composite ;
+feature.compose <numa>on : <define>BOOST_USE_NUMA ;
diff --git a/build.jam b/build.jam
index 27e70aec..81b929f0 100644
--- a/build.jam
+++ b/build.jam
@@ -5,6 +5,11 @@
 
 require-b2 5.2 ;
 
+import-search /boost/predef/tools/check ;
+
+import predef ;
+import boost-fiber-features ;
+
 constant boost_dependencies :
     /boost/assert//boost_assert
     /boost/config//boost_config
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index e4779386..08987b1c 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -14,9 +14,6 @@ import config : requires ;
 import-search /boost/context ;
 import boost-context-features ;
 
-feature.feature numa : on : optional propagated composite ;
-feature.compose <numa>on : <define>BOOST_USE_NUMA ;
-
 constant boost_dependencies_private :
     /boost/algorithm//boost_algorithm
     /boost/filesystem//boost_filesystem