diff --git a/Jamroot b/Jamroot
index 7a7e2de..8c34b51 100644
--- a/Jamroot
+++ b/Jamroot
@@ -147,7 +147,7 @@ for dir in $(all-headers)
 }
 
 local numeric-headers =
-   [ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/*/*/include/boost ] ] ;
+   [ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/numeric/*/include/boost ] ] ;
 
 for dir in $(numeric-headers)
 {
@@ -155,9 +155,18 @@ for dir in $(numeric-headers)
     explicit numeric-$(dir)-headers ;
 }
 
+local chrono-headers =
+   [ MATCH .*libs/chrono/(.*)/include/boost : [ glob libs/chrono/*/include/boost ] ] ;
+
+for dir in $(chrono-headers)
+{
+    link-directory chrono-$(dir)-headers : libs/chrono/$(dir)/include/boost : <location>. ;
+    explicit chrono-$(dir)-headers ;
+}
+
 if $(all-headers)
 {
-    constant BOOST_MODULARLAYOUT : $(all-headers) $(numeric-headers) ;
+    constant BOOST_MODULARLAYOUT : $(all-headers) $(numeric-headers) $(chrono-headers) ;
 }
 
 project boost
@@ -235,7 +244,7 @@ for local l in $(all-libraries)
     }
 }
 
-alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>.  ;
+alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers chrono-$(chrono-headers)-headers : : : <include>.  ;
 explicit headers ;
 
 # Make project ids of all libraries known.
diff --git a/status/Jamfile.v2 b/status/Jamfile.v2
index 0fca514..023bbac 100644
--- a/status/Jamfile.v2
+++ b/status/Jamfile.v2
@@ -60,6 +60,7 @@ run-tests libs :
     bimap/test                  # test-suite bimap
     bind/test                   # test-suite bind
     chrono/test                 # test-suite chrono
+    chrono/stopwatches/test     # test-suite chrono/stopwatches
     circular_buffer/test        # test-suite circular_buffer
     concept_check               # test-suite concept_check
     config/test                 # test-suite config