diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a926f303..1a67d74a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ### v1.13.11
 
+**v1.13.11.1** *(2017-08-10)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.11.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.11.1/builds/4chan-X-noupdate.crx)]
+- Merge v1.13.10.6: Disable 'Redirect to HTTPS' on platforms where we use localStorage for saving settings.
+
 **v1.13.11.0** *(2017-08-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.11.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.11.0/builds/4chan-X-noupdate.crx)]
 - Based on v1.13.10.5.
 - Support [spoiler] and [code] tags in 'Copy Text' menu item.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 06c7459ef..b7f78bcd3 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 a47395150..ec4fff474 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.11.0
+// @version      1.13.11.1
 // @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 de4977cbd..74960a3ea 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.11.0
+// @version      1.13.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.11.0',
+  VERSION:   '1.13.11.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -4983,6 +4983,10 @@ $ = (function() {
     return GM_deleteValue(key);
   };
 
+  if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) {
+    $.perProtocolSettings = true;
+  }
+
   if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) {
     $.getValue = $.GM_getValue;
     $.listValues = function() {
@@ -11030,6 +11034,9 @@ Settings = (function() {
       if ($.engine !== 'gecko') {
         $('div[data-name="Remember QR Size"]', section).hidden = true;
       }
+      if ($.perProtocolSettings) {
+        $('div[data-name="Redirect to HTTPS"]', section).hidden = true;
+      }
       $.get(items, function(items) {
         var val;
         for (key in items) {
@@ -24531,7 +24538,7 @@ Main = (function() {
       items['previousversion'] = void 0;
       return ($.getSync || $.get)(items, function(items) {
         var ref1;
-        if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
+        if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
           location.replace('https:' + location.host + location.pathname + location.search + location.hash);
           return;
         }
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 97d776f62..116eb8d47 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 445b48b78..02fed2584 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.11.0
+// @version      1.13.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.11.0',
+  VERSION:   '1.13.11.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -4983,6 +4983,10 @@ $ = (function() {
     return GM_deleteValue(key);
   };
 
+  if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) {
+    $.perProtocolSettings = true;
+  }
+
   if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) {
     $.getValue = $.GM_getValue;
     $.listValues = function() {
@@ -11030,6 +11034,9 @@ Settings = (function() {
       if ($.engine !== 'gecko') {
         $('div[data-name="Remember QR Size"]', section).hidden = true;
       }
+      if ($.perProtocolSettings) {
+        $('div[data-name="Redirect to HTTPS"]', section).hidden = true;
+      }
       $.get(items, function(items) {
         var val;
         for (key in items) {
@@ -24531,7 +24538,7 @@ Main = (function() {
       items['previousversion'] = void 0;
       return ($.getSync || $.get)(items, function(items) {
         var ref1;
-        if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
+        if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
           location.replace('https:' + location.host + location.pathname + location.search + location.hash);
           return;
         }
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index cf8ebef9c..d8801bc9c 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 e155af4b4..d6a985a44 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.11.0
+// @version      1.13.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 93c289932..74ae16a76 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.11.0
+// @version      1.13.11.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -153,7 +153,7 @@ docSet = function() {
 };
 
 g = {
-  VERSION:   '1.13.11.0',
+  VERSION:   '1.13.11.1',
   NAMESPACE: '4chan X.',
   boards:    {}
 };
@@ -4983,6 +4983,10 @@ $ = (function() {
     return GM_deleteValue(key);
   };
 
+  if (typeof GM_deleteValue === "undefined" || GM_deleteValue === null) {
+    $.perProtocolSettings = true;
+  }
+
   if (typeof GM_deleteValue !== "undefined" && GM_deleteValue !== null) {
     $.getValue = $.GM_getValue;
     $.listValues = function() {
@@ -11030,6 +11034,9 @@ Settings = (function() {
       if ($.engine !== 'gecko') {
         $('div[data-name="Remember QR Size"]', section).hidden = true;
       }
+      if ($.perProtocolSettings) {
+        $('div[data-name="Redirect to HTTPS"]', section).hidden = true;
+      }
       $.get(items, function(items) {
         var val;
         for (key in items) {
@@ -24531,7 +24538,7 @@ Main = (function() {
       items['previousversion'] = void 0;
       return ($.getSync || $.get)(items, function(items) {
         var ref1;
-        if (((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
+        if (!$.perProtocolSettings && ((ref1 = items['Redirect to HTTPS']) != null ? ref1 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
           location.replace('https:' + location.host + location.pathname + location.search + location.hash);
           return;
         }
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 5cccb3094..01a0d8d5d 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 da3baa1d2..ac6dd0217 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.11.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.11.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index f1146f8c1..b087722d5 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.11.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.11.1' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 4f58cd388..81d9ca99a 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.13.11.0",
-  "date": "2017-08-08T06:50:06.788Z"
+  "version": "1.13.11.1",
+  "date": "2017-08-10T13:42:33.033Z"
 }
\ No newline at end of file