diff --git a/CHANGELOG.md b/CHANGELOG.md
index 862b4a08a..f1133c002 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.8
 
+**v1.11.8.1** *(2015-08-08)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.8.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.8.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.7.4: Fix cooldown bug.
+
 **v1.11.8.0** *(2015-08-08)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.8.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.8.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.11.7.3.
 - Posts selected for deletion will now be auto-deleted when 4chan's 60-second deletion cooldown expires.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index baa5cfbcd..3a699c62b 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 c6175c3d8..c82c9ba0f 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.8.0
+// @version      1.11.8.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 862845983..fbd38b355 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.8.0
+// @version      1.11.8.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -411,7 +411,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.8.0',
+    VERSION: '1.11.8.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7582,7 +7582,6 @@
         upCallbacks: {
           onload: function() {
             QR.req.isUploadFinished = true;
-            QR.req.uploadEndTime = Date.now();
             QR.req.progress = '...';
             return QR.status();
           },
@@ -7711,7 +7710,7 @@
         post.rm();
         QR.captcha.setup(d.activeElement === QR.nodes.status);
       }
-      QR.cooldown.add(req.uploadEndTime, threadID, postID);
+      QR.cooldown.add(threadID, postID);
       URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
       if (URL) {
         open = Conf['Open Post in New Tab'] || postsCount ? function() {
@@ -8966,11 +8965,12 @@
       QR.cooldown.data = data || {};
       return QR.cooldown.start();
     },
-    add: function(start, threadID, postID) {
-      var boardID;
+    add: function(threadID, postID) {
+      var boardID, start;
       if (!Conf['Cooldown']) {
         return;
       }
+      start = Date.now();
       boardID = g.BOARD.ID;
       QR.cooldown.set(boardID, start, {
         threadID: threadID,
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index f4431d01e..f42ad5c3d 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 32fee6d54..ca9146853 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.8.0
+// @version      1.11.8.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -410,7 +410,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.8.0',
+    VERSION: '1.11.8.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7581,7 +7581,6 @@
         upCallbacks: {
           onload: function() {
             QR.req.isUploadFinished = true;
-            QR.req.uploadEndTime = Date.now();
             QR.req.progress = '...';
             return QR.status();
           },
@@ -7710,7 +7709,7 @@
         post.rm();
         QR.captcha.setup(d.activeElement === QR.nodes.status);
       }
-      QR.cooldown.add(req.uploadEndTime, threadID, postID);
+      QR.cooldown.add(threadID, postID);
       URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
       if (URL) {
         open = Conf['Open Post in New Tab'] || postsCount ? function() {
@@ -8965,11 +8964,12 @@
       QR.cooldown.data = data || {};
       return QR.cooldown.start();
     },
-    add: function(start, threadID, postID) {
-      var boardID;
+    add: function(threadID, postID) {
+      var boardID, start;
       if (!Conf['Cooldown']) {
         return;
       }
+      start = Date.now();
       boardID = g.BOARD.ID;
       QR.cooldown.set(boardID, start, {
         threadID: threadID,
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 74532214d..b2bf098e5 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 2529c9f82..2ca56b15a 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.8.0
+// @version      1.11.8.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 8a3ec1c08..d270dfc0d 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.8.0
+// @version      1.11.8.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -411,7 +411,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.8.0',
+    VERSION: '1.11.8.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7582,7 +7582,6 @@
         upCallbacks: {
           onload: function() {
             QR.req.isUploadFinished = true;
-            QR.req.uploadEndTime = Date.now();
             QR.req.progress = '...';
             return QR.status();
           },
@@ -7711,7 +7710,7 @@
         post.rm();
         QR.captcha.setup(d.activeElement === QR.nodes.status);
       }
-      QR.cooldown.add(req.uploadEndTime, threadID, postID);
+      QR.cooldown.add(threadID, postID);
       URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
       if (URL) {
         open = Conf['Open Post in New Tab'] || postsCount ? function() {
@@ -8966,11 +8965,12 @@
       QR.cooldown.data = data || {};
       return QR.cooldown.start();
     },
-    add: function(start, threadID, postID) {
-      var boardID;
+    add: function(threadID, postID) {
+      var boardID, start;
       if (!Conf['Cooldown']) {
         return;
       }
+      start = Date.now();
       boardID = g.BOARD.ID;
       QR.cooldown.set(boardID, start, {
         threadID: threadID,
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index ca2776931..6e72e2460 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 1836612d5..a39d279b7 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://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.11.8.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.11.8.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 386a70fb7..aba753bd0 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://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.11.8.0' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.11.8.1' />
   </app>
 </gupdate>
 
diff --git a/package.json b/package.json
index 6c85e4bc2..82c12a7ce 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
-    "version": "1.11.8.0",
-    "date": "2015-08-09T00:14:30.403Z",
+    "version": "1.11.8.1",
+    "date": "2015-08-09T03:37:16.029Z",
     "repo": "https://github.com/ccd0/4chan-x/",
     "page": "https://github.com/ccd0/4chan-x",
     "downloads": "https://ccd0.github.io/4chan-x/builds/",