diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e5a1c2f8..a2b7a6881 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.17
 
+**v1.11.17.1** *(2015-11-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.16.8: Remove obsolete captcha bug workaround that may be causing scrolling to top.
+
 **v1.11.17.0** *(2015-11-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.0/builds/4chan-X-noupdate.crx "Chromium version")]
 - Based on v1.11.16.7.
 - Experimental Maxthon support.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 413e59a94..e0b4fd91d 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 46963b185..a15394c96 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.17.0
+// @version      1.11.17.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 9462532cb..422b62f11 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.17.0
+// @version      1.11.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.17.0',
+    VERSION: '1.11.17.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7968,8 +7968,7 @@
         childList: true,
         subtree: true
       });
-      $.on(d, 'keydown', this.keybinds.bind(this));
-      return window.focus();
+      return $.on(d, 'keydown', this.keybinds.bind(this));
     },
     initNoscript: function() {
       this.noscript = true;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index edbd1768f..e018b5c46 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 b8604e0a6..7deb7cc59 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.17.0
+// @version      1.11.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.17.0',
+    VERSION: '1.11.17.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7968,8 +7968,7 @@
         childList: true,
         subtree: true
       });
-      $.on(d, 'keydown', this.keybinds.bind(this));
-      return window.focus();
+      return $.on(d, 'keydown', this.keybinds.bind(this));
     },
     initNoscript: function() {
       this.noscript = true;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 1db3e004e..4abb035bf 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 04005c1b7..abcc0b9df 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.11.17.0
+// @version      1.11.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 1f69f92b0..611b8b873 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.17.0
+// @version      1.11.17.1
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@@ -433,7 +433,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '1.11.17.0',
+    VERSION: '1.11.17.1',
     NAMESPACE: '4chan X.',
     boards: {}
   };
@@ -7968,8 +7968,7 @@
         childList: true,
         subtree: true
       });
-      $.on(d, 'keydown', this.keybinds.bind(this));
-      return window.focus();
+      return $.on(d, 'keydown', this.keybinds.bind(this));
     },
     initNoscript: function() {
       this.noscript = true;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index a3cac77ff..79ada2039 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 dd55af2fe..f4c452d09 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.17.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.1' />
   </app>
 </gupdate>
 
diff --git a/builds/updates.xml b/builds/updates.xml
index 7c0c0f56b..968c76a33 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.17.0' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.1' />
   </app>
 </gupdate>
 
diff --git a/version.json b/version.json
index 9b2941f54..7a5cc7361 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
 {
-  "version": "1.11.17.0",
-  "date": "2015-11-16T05:42:19.946Z"
+  "version": "1.11.17.1",
+  "date": "2015-11-16T06:41:09.771Z"
 }