diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6a73bd1..bf3ce3a30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ### v1.13.9
 
+**v1.13.9.5** *(2017-06-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.5/builds/4chan-X-noupdate.crx)]
+- Support /pol/ custom flags in archive-related features. #1403
+
 **v1.13.9.4** *(2017-06-13)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.9.4/builds/4chan-X-noupdate.crx)]
 - Update for restoration of custom flags on /pol/. #1403
 
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index c43b5e2a3..502dacc3b 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 9aad097ac..d5a7c21ef 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.9.4
+// @version      1.13.9.5
 // @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 c9f95ea9e..4719c810f 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.9.4
+// @version      1.13.9.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.4',
+  VERSION:   '1.13.9.5',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -5932,7 +5932,8 @@ Fetcher = (function() {
         })(),
         uniqueID: data.poster_hash,
         flagCode: data.poster_country,
-        flag: data.poster_country_name,
+        flagCodeTroll: data.troll_country_code,
+        flag: data.poster_country_name || data.troll_country_name,
         dateUTC: data.timestamp,
         dateText: data.fourchan_date,
         commentHTML: comment
@@ -15092,14 +15093,15 @@ ArchiveLink = (function() {
         });
         return true;
       } : function(post) {
-        var value;
-        value = type === 'country' ? post.info.flagCode : Filter[type](post);
+        var typeParam, value;
+        typeParam = type === 'country' && post.info.flagCodeTroll ? 'tag' : type;
+        value = type === 'country' ? post.info.flagCode || post.info.flagCodeTroll : Filter[type](post);
         if (!value) {
           return false;
         }
         el.href = Redirect.to('search', {
           boardID: post.board.ID,
-          type: type,
+          type: typeParam,
           value: value,
           isSearch: true
         });
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index e1a0b621c..a6b343e21 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 4c6eba811..38fde727b 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.9.4
+// @version      1.13.9.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.4',
+  VERSION:   '1.13.9.5',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -5932,7 +5932,8 @@ Fetcher = (function() {
         })(),
         uniqueID: data.poster_hash,
         flagCode: data.poster_country,
-        flag: data.poster_country_name,
+        flagCodeTroll: data.troll_country_code,
+        flag: data.poster_country_name || data.troll_country_name,
         dateUTC: data.timestamp,
         dateText: data.fourchan_date,
         commentHTML: comment
@@ -15092,14 +15093,15 @@ ArchiveLink = (function() {
         });
         return true;
       } : function(post) {
-        var value;
-        value = type === 'country' ? post.info.flagCode : Filter[type](post);
+        var typeParam, value;
+        typeParam = type === 'country' && post.info.flagCodeTroll ? 'tag' : type;
+        value = type === 'country' ? post.info.flagCode || post.info.flagCodeTroll : Filter[type](post);
         if (!value) {
           return false;
         }
         el.href = Redirect.to('search', {
           boardID: post.board.ID,
-          type: type,
+          type: typeParam,
           value: value,
           isSearch: true
         });
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 628b22200..990bf221e 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 2bcb75493..148f20947 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.9.4
+// @version      1.13.9.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index f0099b36e..39ec65f23 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.9.4
+// @version      1.13.9.5
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.9.4',
+  VERSION:   '1.13.9.5',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -5932,7 +5932,8 @@ Fetcher = (function() {
         })(),
         uniqueID: data.poster_hash,
         flagCode: data.poster_country,
-        flag: data.poster_country_name,
+        flagCodeTroll: data.troll_country_code,
+        flag: data.poster_country_name || data.troll_country_name,
         dateUTC: data.timestamp,
         dateText: data.fourchan_date,
         commentHTML: comment
@@ -15092,14 +15093,15 @@ ArchiveLink = (function() {
         });
         return true;
       } : function(post) {
-        var value;
-        value = type === 'country' ? post.info.flagCode : Filter[type](post);
+        var typeParam, value;
+        typeParam = type === 'country' && post.info.flagCodeTroll ? 'tag' : type;
+        value = type === 'country' ? post.info.flagCode || post.info.flagCodeTroll : Filter[type](post);
         if (!value) {
           return false;
         }
         el.href = Redirect.to('search', {
           boardID: post.board.ID,
-          type: type,
+          type: typeParam,
           value: value,
           isSearch: true
         });
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index c383a24ce..70f903af6 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 9b29e6f24..e1702b23e 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.9.4' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.9.5' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 137ce9761..4ef791e7e 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.9.4' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.9.5' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index ad903ebb4..3dc68fe1e 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.13.9.4",
-  "date": "2017-06-13T16:19:49.060Z"
+  "version": "1.13.9.5",
+  "date": "2017-06-27T22:21:11.331Z"
 }
\ No newline at end of file