diff --git a/_aws/routing-rules.xml b/_aws/routing-rules.xml
index fd5cdbc..ff29650 100644
--- a/_aws/routing-rules.xml
+++ b/_aws/routing-rules.xml
@@ -1,12 +1,4 @@
 <RoutingRules>
-  <RoutingRule>
-    <Condition>
-      <KeyPrefixEquals>whitepaper/bigchaindb-whitepaper.pdf</KeyPrefixEquals>
-    </Condition>
-    <Redirect>
-      <ReplaceKeyPrefixWith>whitepaper/</ReplaceKeyPrefixWith>
-    </Redirect>
-  </RoutingRule>
   <RoutingRule>
     <Condition>
       <KeyPrefixEquals>whitepaper/bigchaindb-primer.pdf</KeyPrefixEquals>
diff --git a/_src/_assets/styles/_page-whitepaper.scss b/_src/_assets/styles/_page-whitepaper.scss
index 3551247..dc60ccb 100644
--- a/_src/_assets/styles/_page-whitepaper.scss
+++ b/_src/_assets/styles/_page-whitepaper.scss
@@ -1,8 +1,8 @@
 
 .page-whitepaper {
     .content--page--markdown {
-        > p:nth-child(1),
-        > p:nth-child(2),
-        > p:nth-child(3) { text-align: center; }
+        > p:first-child {
+            text-align: center;
+        }
     }
 }
diff --git a/_src/_includes/sections/section-cta-whitepaper.html b/_src/_includes/sections/section-cta-whitepaper.html
index 4a85df0..25389fa 100644
--- a/_src/_includes/sections/section-cta-whitepaper.html
+++ b/_src/_includes/sections/section-cta-whitepaper.html
@@ -2,10 +2,10 @@
     <div class="row">
         <header class="section-header">
             <h1 class="section-title">Whitepaper</h1>
-            <p class="section-description">BigchainDB: A Scalable Blockchain Database</p>
+            <p class="section-description">{{ site.name }}: {{ site.description }}</p>
         </header>
 
-        <a class="btn btn-primary" href="/whitepaper/">
+        <a class="btn btn-primary" href="{% link whitepaper/index.md %}">
             <svg class="icon">
                 <use xlink:href="/assets/img/sprite.svg#icon-documents"></use>
             </svg>
diff --git a/_src/_includes/sections/section-whitepaper-download.html b/_src/_includes/sections/section-whitepaper-download.html
new file mode 100644
index 0000000..7df52a9
--- /dev/null
+++ b/_src/_includes/sections/section-whitepaper-download.html
@@ -0,0 +1,15 @@
+<section class="section section-whitepaper-download background--photo">
+    <div class="row">
+        <header class="section-header">
+            <h1 class="section-title">{{ page.whitepaper.title }}</h1>
+            <p class="section-description">{{ page.whitepaper.text }}</p>
+        </header>
+
+        <p class="text-center">
+            {% for whitepaper in page.whitepaper.files %}
+                <a href="{{ whitepaper.file }}" class="btn btn-primary js-tracking-whitepaper-download"><svg class="icon"><use xlink:href="/assets/img/sprite.svg#icon-documents"></use></svg> {{ whitepaper.button }}</a>
+            {% endfor %}
+        </p>
+        <p class="text-center small">Last updated: {{ page.whitepaper.updated | date: '%B %d, %Y' }}</p>
+    </div>
+</section>
diff --git a/_src/_layouts/page.html b/_src/_layouts/page.html
index a29b783..50240bc 100644
--- a/_src/_layouts/page.html
+++ b/_src/_layouts/page.html
@@ -18,6 +18,7 @@ layout: base
 
 </section>
 
-{% if page.title == "Whitepaper" %}
+{% if page.path contains "whitepaper" %}
+    {% include sections/section-whitepaper-download.html %}
     {% include sections/section-newsletter.html %}
 {% endif %}
diff --git a/_src/features.html b/_src/features.html
index 1272e7b..a5e4011 100644
--- a/_src/features.html
+++ b/_src/features.html
@@ -182,4 +182,4 @@ js: page-features.min.js
     </div>
 </section>
 
-{% include sections/section-getstarted.html %}
+{% include sections/section-cta-whitepaper.html %}
diff --git a/_src/whitepaper/bigchaindb-whitepaper.pdf b/_src/whitepaper/bigchaindb-whitepaper.pdf
new file mode 100644
index 0000000..6b5cbe5
Binary files /dev/null and b/_src/whitepaper/bigchaindb-whitepaper.pdf differ
diff --git a/_src/whitepaper/index.md b/_src/whitepaper/index.md
index 55cd9b8..785ff7b 100644
--- a/_src/whitepaper/index.md
+++ b/_src/whitepaper/index.md
@@ -1,23 +1,27 @@
 ---
 layout: page
 
-title: Whitepaper
-description: "We're working on a new whitepaper. Stay tuned for updates."
+title: BigchainDB 2.0 Whitepaper
+description: >
+    BigchainDB version 2.0 makes significant improvements over previous versions. In particular, it is now Byzantine fault tolerant (BFT), so up to a third of the nodes can fail in any way, and the system will continue to agree on how to proceed. BigchainDB 2.0 is also production-ready for many use cases.
 
 image: photo3.jpg
 header: photo3.jpg
 
 whitepaper:
-    title: Whitepaper downloads
-    text: The whitepaper is no longer a living document. Significant changes made since June 8, 2016 are noted in an Addendum attached at the end.
-    updated: 2017-05-23
+    title: Whitepaper Downloads
+    text: The whitepaper is a living document...
+    updated: 2018-05-14
     files:
-        - file: bigchaindb-primer.pdf
-          button: Download primer (pdf)
-          class: btn-primary
         - file: bigchaindb-whitepaper.pdf
-          button: Download whitepaper (pdf)
-          class: btn-link
+          button: Download Whitepaper (pdf)
 ---
 
-<div class="alert alert--info"><div class="lead text-center">We're working on a new whitepaper. Stay tuned for updates.</div></div>
+*May 2018*
+*BigchainDB GmbH, Berlin, Germany*
+
+## Abstract
+
+BigchainDB is software that has blockchain properties (e.g. decentralization, immutability, owner-controlled assets) and database properties (e.g. high transaction rate, low latency, indexing & querying of structured data). It was first released — open source — in February 2016 and has been improved continuously ever since. BigchainDB version 2.0 makes significant improvements over previous versions. In particular, it is now Byzantine fault tolerant (BFT), so up to a third of the nodes can fail in any way, and the system will continue to agree on how to proceed. BigchainDB 2.0 is also production-ready for many use cases.
+
+In this paper, we review the design goals of BigchainDB 2.0 and how they were achieved, we explore some use cases, we show how BigchainDB fits into the overall decentralization ecosystem, we follow the life of a transaction to understand how BigchainDB 2.0 works, we note ways to try BigchainDB, we outline how you can contribute, and we summarize future plans.