diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 39e046727..bb02f5075 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -84,6 +84,16 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
     }
   ]
 
+  const schemaTags = {
+    name: videoNameEscaped,
+    description: videoDescriptionEscaped,
+    duration: video.getActivityStreamDuration(),
+    thumbnailURL: previewUrl,
+    contentURL: videoUrl,
+    embedURL: embedUrl,
+    uploadDate: video.createdAt
+  }
+
   let tagsString = ''
   Object.keys(openGraphMetaTags).forEach(tagName => {
     const tagValue = openGraphMetaTags[tagName]
@@ -95,6 +105,16 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
     tagsString += `<link rel="alternate" type="${oembedLinkTag.type}" href="${oembedLinkTag.href}" title="${oembedLinkTag.title}" />`
   }
 
+  tagsString += '<div itemprop="video" itemscope itemtype="http://schema.org/VideoObject">'
+  tagsString += '<h2>Video: <span itemprop="name">' + schemaTags.name + '</span></h2>'
+
+  Object.keys(schemaTags).forEach(tagName => {
+    const tagValue = schemaTags[tagName]
+    tagsString += `<meta itemprop="${tagName}" content="${tagValue}" />`
+  })
+
+  tagsString += '</div>'
+
   return htmlStringPage.replace(OPENGRAPH_AND_OEMBED_COMMENT, tagsString)
 }
 
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 77c0400d8..81d8a64ff 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -990,8 +990,7 @@ export class VideoModel extends Model<VideoModel> {
       type: 'Video' as 'Video',
       id: this.url,
       name: this.name,
-      // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
-      duration: 'PT' + this.duration + 'S',
+      duration: this.getActivityStreamDuration(),
       uuid: this.uuid,
       tag,
       category,
@@ -1161,6 +1160,11 @@ export class VideoModel extends Model<VideoModel> {
     return unlinkPromise(torrentPath)
   }
 
+  getActivityStreamDuration () {
+    // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
+    return 'PT' + this.duration + 'S'
+  }
+
   private getBaseUrls () {
     let baseUrlHttp
     let baseUrlWs