diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee
index 02549b898..659334dcd 100644
--- a/src/Linkification/Embedding.coffee
+++ b/src/Linkification/Embedding.coffee
@@ -234,6 +234,15 @@ Embedding =
           else
             el.hidden = false
         el
+    ,
+      key: 'PeerTube'
+      regExp: /^(\w+:\/\/[^\/]+\/videos\/watch\/\w{8}-\w{4}-\w{4}-\w{4}-\w{12})(.*)/
+      el: (a) ->
+        options = if (start = a.dataset.options.match /[?&](start=\w+)/) then "?#{start[1]}" else ''
+        el = $.el 'iframe',
+          src: a.dataset.uid.replace('/videos/watch/', '/videos/embed/') + options
+        el.setAttribute "allowfullscreen", "true"
+        el
     ,
       key: 'BitChute'
       regExp:  /^\w+:\/\/(?:www\.)?bitchute\.com\/video\/([\w\-]+)/
diff --git a/src/css/linkify.peertube.png b/src/css/linkify.peertube.png
new file mode 100644
index 000000000..4fc79098b
Binary files /dev/null and b/src/css/linkify.peertube.png differ