diff --git a/README.md b/README.md
index a766efa7..52d5b336 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![PyPI](https://img.shields.io/pypi/v/bigchaindb.svg)](https://pypi.python.org/pypi/BigchainDB)
 [![Travis branch](https://img.shields.io/travis/bigchaindb/bigchaindb/master.svg)](https://travis-ci.org/bigchaindb/bigchaindb)
 [![Codecov branch](https://img.shields.io/codecov/c/github/bigchaindb/bigchaindb/master.svg)](https://codecov.io/github/bigchaindb/bigchaindb?branch=master)
-[![Documentation Status](https://readthedocs.org/projects/bigchaindb/badge/?version=latest)](https://bigchaindb.readthedocs.org/en/latest/)
+[![Documentation Status](http://bigchaindb.readthedocs.io/projects/server/en/latest/?badge=latest)](https://bigchaindb.readthedocs.org/projects/server/en/latest/)
 [![Join the chat at https://gitter.im/bigchaindb/bigchaindb](https://badges.gitter.im/bigchaindb/bigchaindb.svg)](https://gitter.im/bigchaindb/bigchaindb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
@@ -15,11 +15,12 @@ We're hiring! [Learn more](https://github.com/bigchaindb/org/blob/master/engjob.
 
 ## Get Started with BigchainDB Server
 
-### [Quickstart](http://bigchaindb.readthedocs.io/en/latest/quickstart.html)
-### [Set Up & Run a Dev/Test Node](http://bigchaindb.readthedocs.io/en/latest/dev-and-test/setup-run-node.html)
-### [Run BigchainDB Server with Docker](http://bigchaindb.readthedocs.io/en/latest/appendices/run-with-docker.html)
+### [Quickstart](http://bigchaindb.readthedocs.io/projects/server/en/latest/quickstart.html)
+### [Set Up & Run a Dev/Test Node](http://bigchaindb.readthedocs.io/projects/server/en/latest/dev-and-test/setup-run-node.html)
+### [Run BigchainDB Server with Docker](http://bigchaindb.readthedocs.io/projects/server/en/latest/appendices/run-with-docker.html)
 
 ## Links for Everyone
+
 * [BigchainDB.com](https://www.bigchaindb.com/) - the main BigchainDB website, including newsletter signup
 * [Whitepaper](https://www.bigchaindb.com/whitepaper/) - outlines the motivations, goals and core algorithms of BigchainDB
 * [Roadmap](https://github.com/bigchaindb/org/blob/master/ROADMAP.md)
@@ -28,7 +29,9 @@ We're hiring! [Learn more](https://github.com/bigchaindb/org/blob/master/engjob.
 * [Google Group](https://groups.google.com/forum/#!forum/bigchaindb)
 
 ## Links for Developers
-* [BigchainDB Server Documentation](http://bigchaindb.readthedocs.io/en/latest/) - for developers
+
+* [BigchainDB Server Documentation](https://bigchaindb.readthedocs.io/projects/server/en/latest/)
+* [All BigchainDB Documentation](http://bigchaindb.readthedocs.io/en/latest/)
 * [CONTRIBUTING.md](CONTRIBUTING.md) - how to contribute
 * [Community guidelines](CODE_OF_CONDUCT.md)
 * [Open issues](https://github.com/bigchaindb/bigchaindb/issues)
@@ -36,6 +39,7 @@ We're hiring! [Learn more](https://github.com/bigchaindb/org/blob/master/engjob.
 * [Gitter chatroom](https://gitter.im/bigchaindb/bigchaindb)
 
 ## Legal
+
 * [Licenses](LICENSES.md) - open source & open content
 * [Imprint](https://www.bigchaindb.com/imprint/)
 * [Contact Us](https://www.bigchaindb.com/contact/)