diff --git a/scripts/add-matrix-org-stylings.pl b/scripts/add-matrix-org-stylings.pl
index 2eb03d03b..bcc4c354e 100755
--- a/scripts/add-matrix-org-stylings.pl
+++ b/scripts/add-matrix-org-stylings.pl
@@ -31,8 +31,8 @@
     <div class="admonition warning" style="font-size: x-large;">
         <p class="first admonition-title">Warning</p>
         <p class="last">You are viewing an outdated version of this
-        specification. To view the current specification, please 
-        <a class="reference external" href="latest.html">click here</a>.</p>
+        specification. To view the current specification, please
+        <a class="reference external" href="https://spec.matrix.org/latest">click here</a>.</p>
     </div>
 EOT
 
@@ -50,11 +50,11 @@
 
 my $proposalscssinjection = <<EOT;
 <style>
-    table.colwidths-auto tr td:nth-child(3), 
+    table.colwidths-auto tr td:nth-child(3),
     table.colwidths-auto tr td:nth-child(2) {
         width: initial;
     }
-    table.colwidths-auto tr td:nth-child(3), 
+    table.colwidths-auto tr td:nth-child(3),
     table.colwidths-auto tr td:nth-child(4) {
         white-space: nowrap;
     }
diff --git a/scripts/update_docs.sh b/scripts/update_docs.sh
index c15b184f7..29157180a 100755
--- a/scripts/update_docs.sh
+++ b/scripts/update_docs.sh
@@ -25,8 +25,7 @@ cd "$(dirname "$(dirname "${SELF}")")"
 
 # Set up foundations for RapiDoc API playground
 rm -fr unstyled_docs/api/client-server
-mkdir -p unstyled_docs/api/client-server/json
-ln -s ../../../spec/client_server/latest.json unstyled_docs/api/client-server/json/api-docs.json
+mkdir -p unstyled_docs/api/client-server
 
 # copy the unstyled docs and add the styling
 rm -rf content/docs
diff --git a/unstyled_docs/spec/appendices.html b/unstyled_docs/spec/appendices.html
index 0d3f5b14f..e538641d1 100644
--- a/unstyled_docs/spec/appendices.html
+++ b/unstyled_docs/spec/appendices.html
@@ -1024,6 +1024,7 @@
 <p><a class="anchor" id="appendices"></a></p>
 <div class="section" id="appendices">
 <h1><a class="toc-backref" href="#id1">1&nbsp;&nbsp;&nbsp;Appendices</a></h1>
+%outdatedspecwarning%
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title">Table of Contents</p>
 <ul class="auto-toc simple">
diff --git a/unstyled_docs/spec/application_service/latest.html b/unstyled_docs/spec/application_service/latest.html
deleted file mode 120000
index 3e7ef9386..000000000
--- a/unstyled_docs/spec/application_service/latest.html
+++ /dev/null
@@ -1 +0,0 @@
-r0.1.2.html
\ No newline at end of file
diff --git a/unstyled_docs/spec/application_service/r0.1.1.html b/unstyled_docs/spec/application_service/r0.1.1.html
index 6ab7cbc51..c06c1ce67 100644
--- a/unstyled_docs/spec/application_service/r0.1.1.html
+++ b/unstyled_docs/spec/application_service/r0.1.1.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Application Service API</title>
+%outdatedspecwarning%
 <style type="text/css">
 
 /*
diff --git a/unstyled_docs/spec/application_service/r0.1.2.html b/unstyled_docs/spec/application_service/r0.1.2.html
index 8b015d2c9..b4c5b01f4 100644
--- a/unstyled_docs/spec/application_service/r0.1.2.html
+++ b/unstyled_docs/spec/application_service/r0.1.2.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Application Service API</title>
+%outdatedspecwarning%
 <style type="text/css">
 
 /*
diff --git a/unstyled_docs/spec/client_server/latest.html b/unstyled_docs/spec/client_server/latest.html
deleted file mode 120000
index 0de589bf3..000000000
--- a/unstyled_docs/spec/client_server/latest.html
+++ /dev/null
@@ -1 +0,0 @@
-r0.6.1.html
\ No newline at end of file
diff --git a/unstyled_docs/spec/client_server/latest.json b/unstyled_docs/spec/client_server/latest.json
deleted file mode 120000
index 03d249eab..000000000
--- a/unstyled_docs/spec/client_server/latest.json
+++ /dev/null
@@ -1 +0,0 @@
-r0.6.1.json
\ No newline at end of file
diff --git a/unstyled_docs/spec/client_server/r0.5.0.html b/unstyled_docs/spec/client_server/r0.5.0.html
index 0ec9f4c95..37faa235c 100644
--- a/unstyled_docs/spec/client_server/r0.5.0.html
+++ b/unstyled_docs/spec/client_server/r0.5.0.html
@@ -1197,6 +1197,7 @@
 <body>
 <div class="document" id="client-server-api">
 <h1 class="title">Client-Server API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!--  -->
diff --git a/unstyled_docs/spec/client_server/r0.6.0.html b/unstyled_docs/spec/client_server/r0.6.0.html
index c69e046f6..898e2da56 100644
--- a/unstyled_docs/spec/client_server/r0.6.0.html
+++ b/unstyled_docs/spec/client_server/r0.6.0.html
@@ -1197,6 +1197,7 @@
 <body>
 <div class="document" id="client-server-api">
 <h1 class="title">Client-Server API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!--  -->
diff --git a/unstyled_docs/spec/client_server/r0.6.1.html b/unstyled_docs/spec/client_server/r0.6.1.html
index f2df01c91..c50d6f11b 100644
--- a/unstyled_docs/spec/client_server/r0.6.1.html
+++ b/unstyled_docs/spec/client_server/r0.6.1.html
@@ -1284,6 +1284,7 @@
 <body>
 <div class="document" id="client-server-api">
 <h1 class="title">Client-Server API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!--  -->
diff --git a/unstyled_docs/spec/identity_service/latest.html b/unstyled_docs/spec/identity_service/latest.html
deleted file mode 120000
index 54752951a..000000000
--- a/unstyled_docs/spec/identity_service/latest.html
+++ /dev/null
@@ -1 +0,0 @@
-r0.3.0.html
\ No newline at end of file
diff --git a/unstyled_docs/spec/identity_service/r0.2.1.html b/unstyled_docs/spec/identity_service/r0.2.1.html
index e2cfdc9f8..08ba7d622 100644
--- a/unstyled_docs/spec/identity_service/r0.2.1.html
+++ b/unstyled_docs/spec/identity_service/r0.2.1.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Identity Service API</title>
+%outdatedspecwarning%
 <style type="text/css">
 
 /*
diff --git a/unstyled_docs/spec/identity_service/r0.3.0.html b/unstyled_docs/spec/identity_service/r0.3.0.html
index c856d18ee..71be5331d 100644
--- a/unstyled_docs/spec/identity_service/r0.3.0.html
+++ b/unstyled_docs/spec/identity_service/r0.3.0.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>Identity Service API</title>
+%outdatedspecwarning%
 <style type="text/css">
 
 /*
diff --git a/unstyled_docs/spec/index.html b/unstyled_docs/spec/index.html
index ece6d57a4..4159e2eaa 100644
--- a/unstyled_docs/spec/index.html
+++ b/unstyled_docs/spec/index.html
@@ -1004,6 +1004,7 @@
 <body>
 <div class="document" id="matrix-specification">
 <h1 class="title">Matrix Specification</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!--  -->
diff --git a/unstyled_docs/spec/legacy/index.html b/unstyled_docs/spec/legacy/index.html
index 55fbeca55..5301585f2 100644
--- a/unstyled_docs/spec/legacy/index.html
+++ b/unstyled_docs/spec/legacy/index.html
@@ -848,6 +848,7 @@
 <p><a class="anchor" id="matrix-specification"></a></p>
 <div class="section" id="matrix-specification">
 <h1><a class="toc-backref" href="#id58">1&nbsp;&nbsp;&nbsp;Matrix Specification</a></h1>
+%outdatedspecwarning%
 <p><a class="anchor" id="version-0-2-0"></a></p>
 <div class="section" id="version-0-2-0">
 <h2><a class="toc-backref" href="#id59">1.1&nbsp;&nbsp;&nbsp;Version: 0.2.0</a></h2>
diff --git a/unstyled_docs/spec/push_gateway/latest.html b/unstyled_docs/spec/push_gateway/latest.html
deleted file mode 120000
index be573898d..000000000
--- a/unstyled_docs/spec/push_gateway/latest.html
+++ /dev/null
@@ -1 +0,0 @@
-r0.1.1.html
\ No newline at end of file
diff --git a/unstyled_docs/spec/push_gateway/r0.1.0.html b/unstyled_docs/spec/push_gateway/r0.1.0.html
index 82db386d7..e6bb27852 100644
--- a/unstyled_docs/spec/push_gateway/r0.1.0.html
+++ b/unstyled_docs/spec/push_gateway/r0.1.0.html
@@ -841,6 +841,7 @@
 <body>
 <div class="document" id="push-gateway-api">
 <h1 class="title">Push Gateway API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!-- Copyright 2018 New Vector Ltd -->
diff --git a/unstyled_docs/spec/push_gateway/r0.1.1.html b/unstyled_docs/spec/push_gateway/r0.1.1.html
index aaae038f2..24e79bb26 100644
--- a/unstyled_docs/spec/push_gateway/r0.1.1.html
+++ b/unstyled_docs/spec/push_gateway/r0.1.1.html
@@ -917,6 +917,7 @@
 <body>
 <div class="document" id="push-gateway-api">
 <h1 class="title">Push Gateway API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!-- Copyright 2018 New Vector Ltd -->
diff --git a/unstyled_docs/spec/r0.0.0/appendices.html b/unstyled_docs/spec/r0.0.0/appendices.html
index 12fe01156..c8e21f65a 100644
--- a/unstyled_docs/spec/r0.0.0/appendices.html
+++ b/unstyled_docs/spec/r0.0.0/appendices.html
@@ -844,6 +844,7 @@
 
 <div class="document" id="appendices">
 <h1 class="title">Appendices</h1>
+%outdatedspecwarning%
 
 <p><a class="anchor" id="security-threat-model"></a></p>
 <div class="section" id="security-threat-model">
diff --git a/unstyled_docs/spec/r0.0.0/howtos.html b/unstyled_docs/spec/r0.0.0/howtos.html
index 469324541..9f3ae186b 100644
--- a/unstyled_docs/spec/r0.0.0/howtos.html
+++ b/unstyled_docs/spec/r0.0.0/howtos.html
@@ -552,9 +552,9 @@
  * :license: BSD, see LICENSE for details.
  *
  */
- 
+
 /* -- page layout ----------------------------------------------------------- */
- 
+
 body {
     font-family: Arial, sans-serif;
     font-size: 100%;
@@ -576,20 +576,20 @@
 hr {
     border: 1px solid #B1B4B6;
 }
- 
+
 /*
 div.document {
     background-color: #eee;
 }
 */
- 
+
 div.document {
     background-color: #ffffff;
     color: #3E4349;
     padding: 0 30px 30px 30px;
     font-size: 0.9em;
 }
- 
+
 div.footer {
     color: #555;
     width: 100%;
@@ -597,12 +597,12 @@
     text-align: center;
     font-size: 75%;
 }
- 
+
 div.footer a {
     color: #444;
     text-decoration: underline;
 }
- 
+
 div.related {
     background-color: #6BA81E;
     line-height: 32px;
@@ -610,11 +610,11 @@
     text-shadow: 0px 1px 0 #444;
     font-size: 0.9em;
 }
- 
+
 div.related a {
     color: #E2F3CC;
 }
- 
+
 div.sphinxsidebar {
     font-size: 0.75em;
     line-height: 1.5em;
@@ -623,7 +623,7 @@
 div.sphinxsidebarwrapper{
     padding: 20px 0;
 }
- 
+
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     font-family: Arial, sans-serif;
@@ -639,30 +639,30 @@
 div.sphinxsidebar h4{
     font-size: 1.1em;
 }
- 
+
 div.sphinxsidebar h3 a {
     color: #444;
 }
- 
- 
+
+
 div.sphinxsidebar p {
     color: #888;
     padding: 5px 20px;
 }
- 
+
 div.sphinxsidebar p.topless {
 }
- 
+
 div.sphinxsidebar ul {
     margin: 10px 20px;
     padding: 0;
     color: #000;
 }
- 
+
 div.sphinxsidebar a {
     color: #444;
 }
- 
+
 div.sphinxsidebar input {
     border: 1px solid #ccc;
     font-family: sans-serif;
@@ -672,19 +672,19 @@
 div.sphinxsidebar input[type=text]{
     margin-left: 20px;
 }
- 
+
 /* -- body styles ----------------------------------------------------------- */
- 
+
 a {
     color: #005B81;
     text-decoration: none;
 }
- 
+
 a:hover {
     color: #E32E00;
     text-decoration: underline;
 }
- 
+
 div.document h1,
 div.document h2,
 div.document h3,
@@ -699,30 +699,30 @@
     padding: 5px 0 5px 10px;
     text-shadow: 0px 1px 0 white
 }
- 
+
 div.document h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
 div.document h2 { font-size: 150%; background-color: #C8D5E3; }
 div.document h3 { font-size: 120%; background-color: #D8DEE3; }
 div.document h4 { font-size: 110%; background-color: #D8DEE3; }
 div.document h5 { font-size: 100%; background-color: #D8DEE3; }
 div.document h6 { font-size: 100%; background-color: #D8DEE3; }
- 
+
 a.headerlink {
     color: #c60f0f;
     font-size: 0.8em;
     padding: 0 4px 0 4px;
     text-decoration: none;
 }
- 
+
 a.headerlink:hover {
     background-color: #c60f0f;
     color: white;
 }
- 
+
 div.document p, div.document dd, div.document li {
     line-height: 1.5em;
 }
- 
+
 div.admonition p.admonition-title + p {
     display: inline;
 }
@@ -735,29 +735,29 @@
     background-color: #eee;
     border: 1px solid #ccc;
 }
- 
+
 div.seealso {
     background-color: #ffc;
     border: 1px solid #ff6;
 }
- 
+
 div.topic {
     background-color: #eee;
 }
- 
+
 div.warning {
     background-color: #ffe4e4;
     border: 1px solid #f66;
 }
- 
+
 p.admonition-title {
     display: inline;
 }
- 
+
 p.admonition-title:after {
     content: ":";
 }
- 
+
 pre {
     padding: 10px;
     background-color: White;
@@ -769,7 +769,7 @@
     -webkit-box-shadow: 1px 1px 1px #d8d8d8;
     -moz-box-shadow: 1px 1px 1px #d8d8d8;
 }
- 
+
 tt {
     background-color: #ecf0f3;
     color: #222;
@@ -852,6 +852,7 @@
 be "user" not "user_id". -->
 <div class="section" id="how-to-use-the-client-server-api">
 <h1>How to use the client-server API</h1>
+%outdatedspecwarning%
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p class="last">The git version of this document is <tt class="docutils literal">HEAD,tag=r0.0.0,678dbbe</tt></p>
diff --git a/unstyled_docs/spec/r0.0.0/specification.html b/unstyled_docs/spec/r0.0.0/specification.html
index 880f24a7b..ca99f4c1f 100644
--- a/unstyled_docs/spec/r0.0.0/specification.html
+++ b/unstyled_docs/spec/r0.0.0/specification.html
@@ -916,6 +916,7 @@
 <p><a class="anchor" id="matrix-specification"></a></p>
 <div class="section" id="matrix-specification">
 <h1><a class="toc-backref" href="#id58">1&nbsp;&nbsp;&nbsp;Matrix Specification</a></h1>
+%outdatedspecwarning%
 <p><a class="anchor" id="version-0-2-0"></a></p>
 <div class="section" id="version-0-2-0">
 <h2><a class="toc-backref" href="#id59">1.1&nbsp;&nbsp;&nbsp;Version: 0.2.0</a></h2>
diff --git a/unstyled_docs/spec/r0.0.1/appendices.html b/unstyled_docs/spec/r0.0.1/appendices.html
index 12fe01156..c8e21f65a 100644
--- a/unstyled_docs/spec/r0.0.1/appendices.html
+++ b/unstyled_docs/spec/r0.0.1/appendices.html
@@ -844,6 +844,7 @@
 
 <div class="document" id="appendices">
 <h1 class="title">Appendices</h1>
+%outdatedspecwarning%
 
 <p><a class="anchor" id="security-threat-model"></a></p>
 <div class="section" id="security-threat-model">
diff --git a/unstyled_docs/spec/r0.0.1/howtos.html b/unstyled_docs/spec/r0.0.1/howtos.html
index 994f5f57f..93c667b89 100644
--- a/unstyled_docs/spec/r0.0.1/howtos.html
+++ b/unstyled_docs/spec/r0.0.1/howtos.html
@@ -853,6 +853,7 @@
 <p><a class="anchor" id="how-to-use-the-client-server-api"></a></p>
 <div class="section" id="how-to-use-the-client-server-api">
 <h1>How to use the client-server API</h1>
+%outdatedspecwarning%
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p class="last">The git version of this document is <tt class="docutils literal">HEAD,e6af044</tt></p>
diff --git a/unstyled_docs/spec/server_server/latest.html b/unstyled_docs/spec/server_server/latest.html
deleted file mode 120000
index fda8d6665..000000000
--- a/unstyled_docs/spec/server_server/latest.html
+++ /dev/null
@@ -1 +0,0 @@
-r0.1.4.html
\ No newline at end of file
diff --git a/unstyled_docs/spec/server_server/r0.1.2.html b/unstyled_docs/spec/server_server/r0.1.2.html
index 0c637a3da..c7b90162b 100644
--- a/unstyled_docs/spec/server_server/r0.1.2.html
+++ b/unstyled_docs/spec/server_server/r0.1.2.html
@@ -917,6 +917,7 @@
 <body>
 <div class="document" id="federation-api">
 <h1 class="title">Federation API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!-- Copyright 2017-2019 New Vector Ltd -->
diff --git a/unstyled_docs/spec/server_server/r0.1.3.html b/unstyled_docs/spec/server_server/r0.1.3.html
index 8381d929e..047b0d183 100644
--- a/unstyled_docs/spec/server_server/r0.1.3.html
+++ b/unstyled_docs/spec/server_server/r0.1.3.html
@@ -917,6 +917,7 @@
 <body>
 <div class="document" id="federation-api">
 <h1 class="title">Federation API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!-- Copyright 2017-2019 New Vector Ltd -->
diff --git a/unstyled_docs/spec/server_server/r0.1.4.html b/unstyled_docs/spec/server_server/r0.1.4.html
index 994ea59da..08148e0bf 100644
--- a/unstyled_docs/spec/server_server/r0.1.4.html
+++ b/unstyled_docs/spec/server_server/r0.1.4.html
@@ -1004,6 +1004,7 @@
 <body>
 <div class="document" id="federation-api">
 <h1 class="title">Federation API</h1>
+%outdatedspecwarning%
 
 <!-- Copyright 2016 OpenMarket Ltd -->
 <!-- Copyright 2017-2019 New Vector Ltd -->