diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 13ac5162..26bd33ac 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -1,72 +1,21 @@
-
 # Copyright 2005 Daniel James.
 # 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)
 
-using boostbook ;
-using quickbook ;
+import asciidoctor ;
 
-path-constant images_location : ../ ;
-path-constant admonishment_location : ../../../../doc/src/images ;
+html unordered.html : unordered.adoc ;
 
-xml unordered : unordered.qbk :
-    <xsl:param>generate.consistent.ids=1 ;
+install html_ : unordered.html : <location>html ;
 
-boostbook standalone : unordered :
-    <xsl:param>chunk.first.sections=1
-    <xsl:param>chunk.section.depth=2
-    <xsl:param>generate.section.toc.level=2
-    <xsl:param>toc.section.depth=1
-    <xsl:param>toc.max.depth=1
+pdf unordered.pdf : unordered.adoc ;
+explicit unordered.pdf ;
 
-    <xsl:param>boost.compact.typedef=0
-    <xsl:param>boost.compact.function=0
-    <xsl:param>boost.compact.enum=0
-
-    <xsl:param>generate.consistent.ids=1
-
-    # HTML Options:
-
-    <format>html:<xsl:param>boost.root=../../../..
-    <format>html:<xsl:param>img.src.path=../../../../doc/html/
-    <format>xhtml:<xsl:param>boost.root=../../../..
-    <format>xhtml:<xsl:param>img.src.path=../../../../doc/html/
-
-    # PDF Options:
-
-    # TOC Generation: this is needed for FOP-0.9 and later:
-    <xsl:param>fop1.extensions=0
-    <format>pdf:<xsl:param>xep.extensions=1
-    # TOC generation: this is needed for FOP 0.2, but must not be set to zero for FOP-0.9!
-    <format>pdf:<xsl:param>fop.extensions=0
-    # No indent on body text:
-    <format>pdf:<xsl:param>body.start.indent=0pt
-    # Margin size:
-    <format>pdf:<xsl:param>page.margin.inner=0.5in
-    # Margin size:
-    <format>pdf:<xsl:param>page.margin.outer=0.5in
-    # Paper type = A4
-    <format>pdf:<xsl:param>paper.type=A4
-    # Yes, we want graphics for admonishments:
-    <xsl:param>admon.graphics=1
-    # Set this one for PDF generation *only*:
-    # default png graphics are awful in PDF form,
-    # better use SVG's instead:
-    <format>pdf:<xsl:param>admon.graphics.extension=".svg"
-    <format>pdf:<xsl:param>use.role.for.mediaobject=1
-    <format>pdf:<xsl:param>preferred.mediaobject.role=print
-    <format>pdf:<xsl:param>img.src.path=$(images_location)/
-    #<format>pdf:<xsl:param>admon.graphics.path=$(admonishment_location)
-    <format>pdf:<xsl:param>draft.mode="no"
-    <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/unordered/doc/html
-    ;
+install pdf_ : unordered.pdf : <location>pdf ;
+explicit pdf_ ;
 
 ###############################################################################
-alias boostdoc
-    : unordered
-    :
-    :
-    : ;
+alias boostdoc ;
 explicit boostdoc ;
-alias boostrelease ;
+alias boostrelease : html_ ;
 explicit boostrelease ;
diff --git a/doc/unordered.adoc b/doc/unordered.adoc
new file mode 100644
index 00000000..1fe32de9
--- /dev/null
+++ b/doc/unordered.adoc
@@ -0,0 +1,22 @@
+= Boost.Unordered
+:toc: left
+:toclevels: 3
+:idprefix:
+:docinfo: private-footer
+:source-highlighter: rouge
+:source-language: c++
+:nofooter:
+:sectlinks:
+
+:leveloffset: +1
+
+include::unordered/intro.adoc[]
+include::unordered/buckets.adoc[]
+include::unordered/hash_equality.adoc[]
+include::unordered/comparison.adoc[]
+include::unordered/compliance.adoc[]
+include::unordered/rationale.adoc[]
+include::unordered/ref.adoc[]
+include::unordered/changes.adoc[]
+include::unordered/bibliography.adoc[]
+include::unordered/copyright.adoc[]
diff --git a/doc/unordered/bibliography.adoc b/doc/unordered/bibliography.adoc
new file mode 100644
index 00000000..f1a52a57
--- /dev/null
+++ b/doc/unordered/bibliography.adoc
@@ -0,0 +1,2 @@
+[#bibliography]
+= Bibliography
diff --git a/doc/unordered/buckets.adoc b/doc/unordered/buckets.adoc
new file mode 100644
index 00000000..a7dadf24
--- /dev/null
+++ b/doc/unordered/buckets.adoc
@@ -0,0 +1,2 @@
+[#buckets]
+= The Data Structure
diff --git a/doc/unordered/changes.adoc b/doc/unordered/changes.adoc
new file mode 100644
index 00000000..154e3010
--- /dev/null
+++ b/doc/unordered/changes.adoc
@@ -0,0 +1,2 @@
+[#changes]
+= Change Log
diff --git a/doc/unordered/comparison.adoc b/doc/unordered/comparison.adoc
new file mode 100644
index 00000000..27df694c
--- /dev/null
+++ b/doc/unordered/comparison.adoc
@@ -0,0 +1,2 @@
+[#comparison]
+= Comparison with Associative Containers
diff --git a/doc/unordered/compliance.adoc b/doc/unordered/compliance.adoc
new file mode 100644
index 00000000..985e0c59
--- /dev/null
+++ b/doc/unordered/compliance.adoc
@@ -0,0 +1,2 @@
+[#compliance]
+= Standard Compliance
diff --git a/doc/unordered/copyright.adoc b/doc/unordered/copyright.adoc
new file mode 100644
index 00000000..706cdfd1
--- /dev/null
+++ b/doc/unordered/copyright.adoc
@@ -0,0 +1,2 @@
+[#copyright]
+= Copyright and License
diff --git a/doc/unordered/hash_equality.adoc b/doc/unordered/hash_equality.adoc
new file mode 100644
index 00000000..ae1eef99
--- /dev/null
+++ b/doc/unordered/hash_equality.adoc
@@ -0,0 +1,2 @@
+[#hash_equality]
+= Equality Predicates and Hash Functions
diff --git a/doc/unordered/intro.adoc b/doc/unordered/intro.adoc
new file mode 100644
index 00000000..73481810
--- /dev/null
+++ b/doc/unordered/intro.adoc
@@ -0,0 +1,2 @@
+[#intro]
+= Introduction
diff --git a/doc/unordered/rationale.adoc b/doc/unordered/rationale.adoc
new file mode 100644
index 00000000..8feb72e1
--- /dev/null
+++ b/doc/unordered/rationale.adoc
@@ -0,0 +1,2 @@
+[#rationale]
+= Implementation Rationale
diff --git a/doc/unordered/ref.adoc b/doc/unordered/ref.adoc
new file mode 100644
index 00000000..8863724a
--- /dev/null
+++ b/doc/unordered/ref.adoc
@@ -0,0 +1,2 @@
+[#reference]
+= Reference