diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6589e9d..45e1b95b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ### v1.13.1
 
+**v1.13.1.7** *(2016-11-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.7/builds/4chan-X-noupdate.crx)]
+- Fix in-comment links to is.4chan.org.
+
 **v1.13.1.6** *(2016-11-14)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.6/builds/4chan-X-noupdate.crx)]
 - (desaku) Update 4chanJS favicons to reflect the native extension. #1038
 - Fix reply-to-you favicons in `xat-` set looking blurry.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index c9360e4a2..bd17f43c8 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index aab5cc020..79bf53740 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.1.6
+// @version      1.13.1.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index c0643447d..b8c11270e 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.1.6
+// @version      1.13.1.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.1.6',
+  VERSION:   '1.13.1.7',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -13208,15 +13208,22 @@ ImageHost = (function() {
       });
     },
     node: function() {
-      var m;
-      if (!(this.file && !this.isClone && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/)))) {
+      var i, len, link, m, ref;
+      if (this.isClone) {
         return;
       }
-      this.file.link.hostname = 'i.4cdn.org';
-      if (this.file.thumbLink) {
-        this.file.thumbLink.hostname = 'i.4cdn.org';
+      if (this.file && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/))) {
+        this.file.link.hostname = 'i.4cdn.org';
+        if (this.file.thumbLink) {
+          this.file.thumbLink.hostname = 'i.4cdn.org';
+        }
+        this.file.url = this.file.link.href;
+      }
+      ref = $$('a[href^="http://is.4chan.org/"], a[href^="https://is.4chan.org/"]', this.nodes.comment);
+      for (i = 0, len = ref.length; i < len; i++) {
+        link = ref[i];
+        link.hostname = 'i.4cdn.org';
       }
-      return this.file.url = this.file.link.href;
     }
   };
 
@@ -14260,7 +14267,7 @@ Embedding = (function() {
             controls: true,
             preload: 'auto',
             src: a.dataset.href,
-            loop: /^https?:\/\/i\.4cdn\.org\//.test(a.dataset.href)
+            loop: /^https?:\/\/(i\.4cdn|is\.4chan)\.org\//.test(a.dataset.href)
           });
           $.on(el, 'loadedmetadata', function() {
             if (el.videoHeight === 0 && el.parentNode) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index cc83dfb29..c6ca06053 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 4fe473a54..ee167f0ae 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.6
+// @version      1.13.1.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.1.6',
+  VERSION:   '1.13.1.7',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -13208,15 +13208,22 @@ ImageHost = (function() {
       });
     },
     node: function() {
-      var m;
-      if (!(this.file && !this.isClone && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/)))) {
+      var i, len, link, m, ref;
+      if (this.isClone) {
         return;
       }
-      this.file.link.hostname = 'i.4cdn.org';
-      if (this.file.thumbLink) {
-        this.file.thumbLink.hostname = 'i.4cdn.org';
+      if (this.file && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/))) {
+        this.file.link.hostname = 'i.4cdn.org';
+        if (this.file.thumbLink) {
+          this.file.thumbLink.hostname = 'i.4cdn.org';
+        }
+        this.file.url = this.file.link.href;
+      }
+      ref = $$('a[href^="http://is.4chan.org/"], a[href^="https://is.4chan.org/"]', this.nodes.comment);
+      for (i = 0, len = ref.length; i < len; i++) {
+        link = ref[i];
+        link.hostname = 'i.4cdn.org';
       }
-      return this.file.url = this.file.link.href;
     }
   };
 
@@ -14260,7 +14267,7 @@ Embedding = (function() {
             controls: true,
             preload: 'auto',
             src: a.dataset.href,
-            loop: /^https?:\/\/i\.4cdn\.org\//.test(a.dataset.href)
+            loop: /^https?:\/\/(i\.4cdn|is\.4chan)\.org\//.test(a.dataset.href)
           });
           $.on(el, 'loadedmetadata', function() {
             if (el.videoHeight === 0 && el.parentNode) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index bb8a8c31b..8753ddb50 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index c4389ebf8..b5552bce5 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.6
+// @version      1.13.1.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 03038597e..bb16d751a 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.6
+// @version      1.13.1.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -147,7 +147,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.1.6',
+  VERSION:   '1.13.1.7',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -13208,15 +13208,22 @@ ImageHost = (function() {
       });
     },
     node: function() {
-      var m;
-      if (!(this.file && !this.isClone && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/)))) {
+      var i, len, link, m, ref;
+      if (this.isClone) {
         return;
       }
-      this.file.link.hostname = 'i.4cdn.org';
-      if (this.file.thumbLink) {
-        this.file.thumbLink.hostname = 'i.4cdn.org';
+      if (this.file && (m = this.file.url.match(/^https?:\/\/is\.4chan\.org\/(.*)$/))) {
+        this.file.link.hostname = 'i.4cdn.org';
+        if (this.file.thumbLink) {
+          this.file.thumbLink.hostname = 'i.4cdn.org';
+        }
+        this.file.url = this.file.link.href;
+      }
+      ref = $$('a[href^="http://is.4chan.org/"], a[href^="https://is.4chan.org/"]', this.nodes.comment);
+      for (i = 0, len = ref.length; i < len; i++) {
+        link = ref[i];
+        link.hostname = 'i.4cdn.org';
       }
-      return this.file.url = this.file.link.href;
     }
   };
 
@@ -14260,7 +14267,7 @@ Embedding = (function() {
             controls: true,
             preload: 'auto',
             src: a.dataset.href,
-            loop: /^https?:\/\/i\.4cdn\.org\//.test(a.dataset.href)
+            loop: /^https?:\/\/(i\.4cdn|is\.4chan)\.org\//.test(a.dataset.href)
           });
           $.on(el, 'loadedmetadata', function() {
             if (el.videoHeight === 0 && el.parentNode) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 57a6c593b..79a0fc128 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 3fcacff3f..b41b980cd 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.6' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.7' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index ef88213ef..6032cc56c 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.6' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.7' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 474a0c93c..7eb83c6c5 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.13.1.6",
-  "date": "2016-11-14T02:04:14.115Z"
+  "version": "1.13.1.7",
+  "date": "2016-11-18T03:44:47.789Z"
 }
\ No newline at end of file