diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index e5c5766a3f..8572efffae 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -39,6 +39,7 @@ boostbook doc
     <dependency>../libs/interprocess/doc//interprocess
     <dependency>../libs/intrusive/doc//autodoc.xml
     <dependency>../libs/intrusive/doc//intrusive
+    <dependency>../libs/units/doc//units
     <dependency>../libs/unordered/doc//unordered
     <dependency>../libs/asio/doc//asio
     <dependency>../libs/thread/doc//thread
@@ -58,6 +59,7 @@ boostbook doc
     <implicit-dependency>../libs/mpi/doc//mpi
     <implicit-dependency>../libs/interprocess/doc//interprocess
     <implicit-dependency>../libs/intrusive/doc//intrusive
+    <implicit-dependency>../libs/units/doc//units
     <implicit-dependency>../libs/unordered/doc//unordered
     <implicit-dependency>../libs/thread/doc//thread
 
diff --git a/doc/src/boost.xml b/doc/src/boost.xml
index 9fddf825a4..2d2325eb2d 100644
--- a/doc/src/boost.xml
+++ b/doc/src/boost.xml
@@ -709,6 +709,8 @@
      </libraryinfo>
    </library>
 
+   <xi:include href="units.xml"/>
+
    <xi:include href="unordered.xml"/>
 
    <library name="Utility" dirname="utility" html-only="1">
diff --git a/libs/libraries.htm b/libs/libraries.htm
index 4dd8b2503c..5cb34c432b 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -275,6 +275,9 @@ how to download, build, and install the libraries.</p>
         Typeof operator emulation, from Arkadiy Vertleyb and Peder Holt.</li>
     <li><a href="numeric/ublas/doc/index.htm">uBLAS</a> - Basic linear algebra
     for dense, packed and sparse matrices, from Joerg Walter and Mathias Koch.</li>
+    <li><a href="units/index.html">units</a> -
+        Zero-overhead dimensional analysis and unit/quantity
+        manipulation and conversion, from Matthias Schabel and Steven Watanabe.</li>
     <li><a href="../doc/html/unordered.html">unordered</a> - unordered associative containers, from Daniel James.</li>
     <li><a href="utility/utility.htm">utility</a> - Class <b>noncopyable</b>
         plus <b>checked_delete()</b>, <b>checked_array_delete()</b>, <b>next(),</b>&nbsp;
@@ -671,6 +674,9 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
     <li><a href="../doc/html/tribool.html">tribool</a> - 3-state boolean type library, from Doug Gregor.</li>
     <li><a href="typeof/index.html">typeof</a> -
         Typeof operator emulation, from Arkadiy Vertleyb and Peder Holt.</li>
+    <li><a href="units/index.html">units</a> -
+        Zero-overhead dimensional analysis and unit/quantity
+        manipulation and conversion, from Matthias Schabel and Steven Watanabe.</li>
     <li><a href="utility/utility.htm">utility</a> - Class <b>noncopyable</b>
         plus <b>checked_delete()</b>, <b>checked_array_delete()</b>, <b>next(),</b>&nbsp;
       <b>prior()</b>
diff --git a/libs/units b/libs/units
index af82085e43..60bff01a0b 160000
--- a/libs/units
+++ b/libs/units
@@ -1 +1 @@
-Subproject commit af82085e43905d9181ad6edd1d3bf09bca3cf508
+Subproject commit 60bff01a0b7fb9144b45cee3758c8de87c1ee549