diff --git a/routes/index.js b/routes/index.js
index ca58de6..7338627 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -105,6 +105,22 @@ function checkAuth(req, res, next) {
 function convert(req, res, next) {
   for (file in req.files) {
     let nameAndExtension = extension(req.files[file].originalname);
+    let oembed = {
+      type: "video",
+      version: "1.0",
+      provider_name: "embedder",
+      provider_url: "https://github.com/WaveringAna/embedder",
+      cache_age: 86400,
+      html: "<iframe src='" + req.protocol + "://" + req.get('host') + "/gifv/" + req.files[file].filename + "'></iframe>",
+      width: 640,
+      height: 360
+    };
+
+    fs.writeFile('uploads/oembed-' + req.files[file].filename + '.json', JSON.stringify(oembed), function (err) {
+      if (err) return next(err);
+      console.log('oembed file created ' + req.files[file].filename + '.json');
+    });
+
     if (nameAndExtension[1] == '.mp4') {
       console.log('Converting ' + nameAndExtension[0] + nameAndExtension[1] + ' to gif');
       console.log(nameAndExtension[0] + nameAndExtension[1]);
diff --git a/views/gifv.ejs b/views/gifv.ejs
index 63d52b9..2d4cb64 100644
--- a/views/gifv.ejs
+++ b/views/gifv.ejs
@@ -13,8 +13,9 @@ function extension(str){
   <meta name="twitter:player" content="<%= host %>/uploads/<%= extension(url)[0] %>.mp4">
   <meta name="twitter:player:width" content="<%= width %>"></meta>
   <meta name="twitter:player:height" content="<%= height %>"></meta>
-  <meta name="twitter:player:stream" content="<%= url %>"></meta>
+  <meta name="twitter:player:stream" content="<%= host %>/uploads/<%= extension(url)[0] %>.mp4">
   <meta name="twitter:player:stream:content_type" content="text/mp4"></meta>
+  <link rel="alternate" type="application/json+oembed" href="<%= host %>/uploads/oembed-<%= extension(url)[0] + extension(url)[1] %>.json"></link>
   <meta property="og:url" content="<%= host %>/uploads/<%= extension(url)[0] %>.gif"></meta>
   <meta property="og:description" content="Click to view the GIF"></meta>
   <meta property="og:type" content="video.other"></meta>