diff --git a/Jamfile b/Jamfile
deleted file mode 100644
index f0de2e0bc8..0000000000
--- a/Jamfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#  Boost.ProgramOptions Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  Use, modification, and distribution are subject to 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)
-
-# please order by name to ease maintenance
-build-project example ;
-build-project test ;
diff --git a/build.jam b/build.jam
new file mode 100644
index 0000000000..ab577bc320
--- /dev/null
+++ b/build.jam
@@ -0,0 +1,34 @@
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/any//boost_any
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/detail//boost_detail
+    /boost/function//boost_function
+    /boost/iterator//boost_iterator
+    /boost/lexical_cast//boost_lexical_cast
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/static_assert//boost_static_assert
+    /boost/throw_exception//boost_throw_exception
+    /boost/type_traits//boost_type_traits ;
+
+project /boost/program_options
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_program_options : build//boost_program_options ]
+    [ alias all : boost_program_options example test ]
+    ;
+
+call-if : boost-library program_options
+    : install boost_program_options
+    ;
+
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 852054d017..f366cfa16a 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,16 +1,25 @@
 
-project boost/program_options 
-    : source-location ../src 
+constant boost_dependencies_private :
+    /boost/bind//boost_bind
+    /boost/tokenizer//boost_tokenizer
+    ;
+
+project
+    : source-location ../src
+    : common-requirements <library>$(boost_dependencies)
+    : requirements <library>$(boost_dependencies_private)
     ;
 
 SOURCES =
-    cmdline config_file options_description parsers variables_map 
+    cmdline config_file options_description parsers variables_map
     value_semantic positional_options utf8_codecvt_facet
     convert winmain split
     ;
 
-boost-lib program_options
+lib boost_program_options
     : $(SOURCES).cpp
     : # See https://svn.boost.org/trac/boost/ticket/5049
       <target-os>hpux,<toolset>gcc:<define>_INCLUDE_STDC__SOURCE_199901
-    ;
\ No newline at end of file
+      <link>shared:<define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1
+      <define>BOOST_PROGRAM_OPTIONS_NO_LIB=1
+    ;
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 22a680ef7c..616e55267b 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -2,15 +2,15 @@
 import toolset ;
 toolset.using doxygen ;
 
-boostbook program_option 
-    : program_options.xml 
-    : <implicit-dependency>autodoc 
+boostbook program_option
+    : program_options.xml
+    : <implicit-dependency>autodoc
       <xsl:param>boost.root=../../../..
       <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
     ;
 
-doxygen autodoc 
-    : [ glob ../../../boost/program_options/*.hpp ] ;
+doxygen autodoc
+    : [ glob ../include/boost/program_options/*.hpp ] ;
 
 ###############################################################################
 alias boostdoc
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0f1a6e7aa9..968b5a82d1 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -38,7 +38,7 @@ test-suite program_options :
     [ run options_description_test.cpp : : : <rtti>off : options_description_no_rtti_test ]
     ;
         
-exe test_convert : test_convert.cpp ;   
+exe test_convert : test_convert.cpp /boost/timer//boost_timer ;
 
 # `quick` target (for CI)
 run quick.cpp : --path=initial ;