diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479d9e34f..28a3c18cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.21
 
+**v1.11.21.2** *(2015-12-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.21.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.21.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- Fix minor bugs in migration of old sauce settings.
+
 **v1.11.21.1** *(2015-12-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.21.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.21.1/builds/4chan-X-noupdate.crx "Chromium version")]
 - Merge v1.11.20.4: Make Google search for full images work again.
 
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 31ac4dc9d..16035f0ae 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 f13897a48..d3e65f459 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.11.21.1
+// @version      1.11.21.2
 // @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 ef8011727..97a1c4673 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.11.21.1
+// @version      1.11.21.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.21.1',
+    VERSION: '1.11.21.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -17154,7 +17154,7 @@
       }
     },
     upgrade: function(data, version) {
-      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, rice, type, uids, value;
+      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, ref5, rice, type, uids, value;
       changes = {};
       compareString = version.replace(/\d+/g, function(x) {
         return ('0000' + x).slice(-5);
@@ -17213,7 +17213,7 @@
       }
       if (compareString < '00001.00011.00017.00006') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/(#?\s*)http:\/\/iqdb\.org\//g, '$1//iqdb.org/');
+          changes['sauces'] = data['sauces'].replace(/^(#?\s*)http:\/\/iqdb\.org\//mg, '$1//iqdb.org/');
         }
       }
       if (compareString < '00001.00011.00019.00003' && !Settings.overlay) {
@@ -17237,7 +17237,7 @@
       }
       if (compareString < '00001.00011.00020.00004' || compareString === '00001.00011.00021.00000') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
+          changes['sauces'] = ((ref5 = changes['sauces']) != null ? ref5 : data['sauces']).replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
         }
       }
       return changes;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 0028f6926..faf3021b5 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 3d1ca0312..d5d2dc528 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.21.1
+// @version      1.11.21.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.21.1',
+    VERSION: '1.11.21.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -17154,7 +17154,7 @@
       }
     },
     upgrade: function(data, version) {
-      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, rice, type, uids, value;
+      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, ref5, rice, type, uids, value;
       changes = {};
       compareString = version.replace(/\d+/g, function(x) {
         return ('0000' + x).slice(-5);
@@ -17213,7 +17213,7 @@
       }
       if (compareString < '00001.00011.00017.00006') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/(#?\s*)http:\/\/iqdb\.org\//g, '$1//iqdb.org/');
+          changes['sauces'] = data['sauces'].replace(/^(#?\s*)http:\/\/iqdb\.org\//mg, '$1//iqdb.org/');
         }
       }
       if (compareString < '00001.00011.00019.00003' && !Settings.overlay) {
@@ -17237,7 +17237,7 @@
       }
       if (compareString < '00001.00011.00020.00004' || compareString === '00001.00011.00021.00000') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
+          changes['sauces'] = ((ref5 = changes['sauces']) != null ? ref5 : data['sauces']).replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
         }
       }
       return changes;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 109d366ac..60da2285b 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 a84195c2f..6f556f674 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.21.1
+// @version      1.11.21.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 6f16437a4..2e6d3c98d 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.21.1
+// @version      1.11.21.2
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.21.1',
+    VERSION: '1.11.21.2',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -17154,7 +17154,7 @@
       }
     },
     upgrade: function(data, version) {
-      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, rice, type, uids, value;
+      var boardID, changes, compareString, k, key, len1, name, record, ref, ref1, ref2, ref3, ref4, ref5, rice, type, uids, value;
       changes = {};
       compareString = version.replace(/\d+/g, function(x) {
         return ('0000' + x).slice(-5);
@@ -17213,7 +17213,7 @@
       }
       if (compareString < '00001.00011.00017.00006') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/(#?\s*)http:\/\/iqdb\.org\//g, '$1//iqdb.org/');
+          changes['sauces'] = data['sauces'].replace(/^(#?\s*)http:\/\/iqdb\.org\//mg, '$1//iqdb.org/');
         }
       }
       if (compareString < '00001.00011.00019.00003' && !Settings.overlay) {
@@ -17237,7 +17237,7 @@
       }
       if (compareString < '00001.00011.00020.00004' || compareString === '00001.00011.00021.00000') {
         if (data['sauces'] != null) {
-          changes['sauces'] = data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
+          changes['sauces'] = ((ref5 = changes['sauces']) != null ? ref5 : data['sauces']).replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|URL)(?=$|;)/mg, '$&%3Fs.jpg');
         }
       }
       return changes;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 5af76ff93..943fb1d23 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 b1846c995..6d4f9c6bc 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.11.21.1' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.21.2' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index ffd674045..bfd5030c5 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.11.21.1' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.21.2' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 35002f5ed..3d28d58b2 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.11.21.1",
-  "date": "2015-12-15T22:26:44.958Z"
+  "version": "1.11.21.2",
+  "date": "2015-12-16T03:02:30.799Z"
 }