diff --git a/changelog.md b/changelog.md
index bd8d1496b6..6524d96803 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## v.3.0.0-alpha1 - XX XXX, 2017
+
+Breaking Changes
+
+- Dropped support for `UPPER_CASE` commands
+- Dropped support for `snake_case`
+- Dropped support for Node.js < 4
+- Removed `drain` event
+- Removed `idle` event
+- Removed `parser` option
+- Removed `retryMaxDelay` (max_delay) option
+- Removed `maxAttempts` (max_attempts) option
+- Removed `socketNoDelay` (socket_no_delay) option
+- Removed `Redis.print` helper function
+- Changed return value of `(p)(un)subscribe`
+  - Return an array with the number of current subscribed channels and an array with all affected channels
+- Changed `connectTimeout` (connect_timeout) option
+  - This timeout does not limit the total retry time anymore
+  - From now on this will only set the stream timeout to connect to the host
+- Only emit ready when all commands were truly send to Redis
+
 ## v.2.7.2 - 14 Mar, 2017
 
 Bugfixes
diff --git a/test/node_redis.spec.js b/test/node_redis.spec.js
index 06af10225e..f808d62b7a 100644
--- a/test/node_redis.spec.js
+++ b/test/node_redis.spec.js
@@ -18,7 +18,7 @@ describe('The nodeRedis client', function () {
         fs.readFile(path.resolve(__dirname, '../lib/individualCommands.js'), 'utf8', function (err, data) {
             var clientPrototype = data.match(/(\n| = )RedisClient\.prototype.[a-zA-Z_]+/g);
             var multiPrototype = data.match(/(\n| = )Multi\.prototype\.[a-zA-Z_]+/g);
-            // Check that every entry RedisClient entry has a correspondend Multi entry
+            // Check that every entry RedisClient entry has a correspondent Multi entry
             assert.strictEqual(clientPrototype.filter(function (entry) {
                 return multiPrototype.indexOf(entry.replace('RedisClient', 'Multi')) === -1;
             }).length, 3); // multi and batch are included too