diff --git a/00-RELEASENOTES b/00-RELEASENOTES
index 652ca1d1..08635bb8 100644
--- a/00-RELEASENOTES
+++ b/00-RELEASENOTES
@@ -10,6 +10,89 @@ HIGH:     There is a critical bug that may affect a subset of users. Upgrade!
 CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 --------------------------------------------------------------------------------
 
+================================================================================
+Redis 4.0.2     Released Thu Sep 21 15:47:53 CEST 2017
+================================================================================
+
+Upgrade urgency HIGH: Several potentially critical bugs fixed.
+
+Hello, this release addresses several significant bugs in Redis 4.0:
+
+1. A number of bugs were fixed in the area of PSYNC2 replication in the
+specific area of restarting an instance with an RDB file having the
+repliacation meta-data to continue without a full resynchronization. The
+old code allowed several inconsistencies under certain conditions, like
+starting a master with an RDB file generated by a slave, and later using
+such master to connect previous slaves having the same replication history.
+Because of other bugs, sometimes the replication resulted in a full
+synchronization even if actually a partial resynchronization was possible
+and so forth. Several commits by different authors fix different bugs here.
+
+2. AOF flush on SHUTDOWN did not cared to really write the AOF buffers
+(not in the kernel but in the Redis process memory) to disk before exiting.
+Calling SHUTDOWN during traffic resulted into not every operation to be
+persisted on disk.
+
+3. The SLOWLOG could reference values inside string objects stored at keys,
+creating a race condition during FLUSHALL ASYNC while the DB is reclaimed
+in another thread.
+
+There are other smaller bugs addessed in this relase, see the full commit
+history below for more information.
+
+A big thank you to all the contributors of this release. Without the
+help I received, Redis 4.0 would take a much longer time to mature. It's
+a real pleasure to work together with people around the world, while making
+Redis better.
+
+antirez in commit 1c60b7a6:
+ Clarify comment in change fixing #4323.
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+zhaozhao.zz in commit 368124e8:
+ Lazyfree: avoid memory leak when free slowlog entry
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+antirez in commit 79567b6e:
+ PSYNC2: More refinements related to #4316.
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+zhaozhao.zz in commit f1194649:
+ PSYNC2: make persisiting replication info more solid
+ 4 files changed, 33 insertions(+), 9 deletions(-)
+
+antirez in commit 097a5556:
+ PSYNC2: Fix the way replication info is saved/loaded from RDB.
+ 4 files changed, 49 insertions(+), 23 deletions(-)
+
+antirez in commit f1a2cbfd:
+ PSYNC2: Create backlog on slave partial sync as well.
+ 1 file changed, 5 insertions(+)
+
+antirez in commit 0c0b77d1:
+ Add MEMORY DOCTOR to MEMORY HELP.
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+Mota in commit fa6bd1b2:
+ redis-benchmark: default value size usage update.
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+jybaek in commit ad0ddcf3:
+ Remove Duplicate Processing
+ 1 file changed, 1 deletion(-)
+
+Oran Agra (and also Buğra Gedik) in commit 8651e5d5:
+ Flush append only buffers before existing.
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+antirez in commit f2b2897f:
+ Changelog: note that 4.0 CLUSTER NODES output changed.
+ 1 file changed, 6 insertions(+)
+
+Itamar Haber in commit 363be783:
+ Changes command stats iteration to being dict-based
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
 ================================================================================
 Redis 4.0.1     Released Mon Jul 24 15:51:31 CEST 2017
 ================================================================================
diff --git a/src/version.h b/src/version.h
index 38823b15..b12e36e6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "4.0.1"
+#define REDIS_VERSION "4.0.2"