2 files changed, 9 insertions, 1 deletions

diff --git a/README.md b/README.md
index dc5f875ef..19233307c 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,12 @@ donating to them](https://soutenir.framasoft.org/en/).**
   </a>
 </p>
 
+<p align="center">
+  <strong><a title="Website" target="_blank" href="https://joinpeertube.org">Website</a> |
+  <a title="Instances list" target="_blank" href="https://instances.joinpeertube.org">Instances list</a>
+  </strong>
+</p>
+
 ## Demonstration
 
 Want to see it in action?
@@ -70,6 +76,8 @@ Want to see it in action?
      * [peertube3.cpy.re](http://peertube3.cpy.re)
    * [Video](https://peertube.cpy.re/videos/watch/f78a97f8-a142-4ce1-a5bd-154bf9386504)
      to see what the "decentralization feature" looks like
+   * [Video](https://peertube.cpy.re/videos/watch/da2b08d4-a242-4170-b32a-4ec8cbdca701) to see
+   the communication between PeerTube and [Mastodon](https://github.com/tootsuite/mastodon)
 
 ## Why
 
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 3ac84d55a..06aca9bcd 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -29,7 +29,7 @@
       </div>
 
       <footer class="row">
-        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> -
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> -
         <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a>
       </footer>
     </div>