diff --git a/History.md b/History.md
index 19b5903be..0dde01566 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 
+1.8.4  / 2017-04-28
+===================
+
+  * [fix] Fix null payload when aborting connection (#503) (cherry-picked)
+  * [chore] Bump ws to version 1.1.4 (#495)
+
 1.8.3  / 2017-02-16
 ===================
 
diff --git a/package.json b/package.json
index 3bab384b8..015249614 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine.io",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "The realtime engine behind Socket.IO. Provides the foundation of a bidirectional connection between client and server",
   "main": "./lib/engine.io",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "babel-eslint": "5.0.0",
     "babel-preset-es2015": "6.3.13",
-    "engine.io-client": "1.8.3",
+    "engine.io-client": "1.8.4",
     "eslint-config-standard": "4.4.0",
     "eslint-plugin-standard": "1.3.2",
     "expect.js": "0.2.0",