diff --git a/Changelog b/Changelog
index b544e8846..c9ef5ef3e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,16 @@
+* Fri Dec 01 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.2
+    - BUGFIX: Fix crash on some systems when creating address object for 255.255.255.255. Closes #7735. (sledgehammer999)
+    - PERFORMANCE: Change MixedModeAlgorithm default to TCP. This was the v3_3_x default and should sustain higher speeds. Closes #7779. (Chocobo1)
+    - PERFORMANCE: Stop logging IP filter parsing errors after a while, otherwise the GUI freezes or qBittorrent doesn't start. (sledgehammer999)
+    - GUI: Implement stable sort. Rows in transfer list shouldn't flicker anymore. (Chocobo1)
+    - WEBUI: Fix build when webui is disabled. (Heiko Becker)
+    - RSS: Fix build because of missing header. Closes #7805. (thoradia)
+    - RSS: Fix RSS parser. (glassez)
+    - RSS: Implement Import/Export RSS rules in legacy(aka v3_3_x) format. (glassez)
+    - RSS: Implement Import/Export RSS rules in JSON format. (glassez)
+    - WINDOWS: Fixed blurry text under Windows by setting DPI awareness to default. (TheNicker)
+    - LINUX: Fix i386 build. (Evgeny Lensky)
+
 * Wed Nov 22 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.1
     - BUGFIX: Fix crash on opening torrent/magnet (uninitialized pointer). Closes #7739 #7723. (sledgehammer999)
     - BUGFIX: Enable preferences Apply button when ip banlist is modified (Thomas Piccirello)
diff --git a/dist/mac/Info.plist b/dist/mac/Info.plist
index 3fbfd66a2..ce1f15fb4 100644
--- a/dist/mac/Info.plist
+++ b/dist/mac/Info.plist
@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.1</string>
+	<string>4.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
diff --git a/dist/windows/options.nsi b/dist/windows/options.nsi
index 50b5b17cc..d71174bab 100644
--- a/dist/windows/options.nsi
+++ b/dist/windows/options.nsi
@@ -27,7 +27,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.0.1"
+!define PROG_VERSION "4.0.2"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
diff --git a/version.pri b/version.pri
index 4037942d7..0276fe4e1 100644
--- a/version.pri
+++ b/version.pri
@@ -4,7 +4,7 @@ PROJECT_NAME = qbittorrent
 # Define version numbers here
 VER_MAJOR = 4
 VER_MINOR = 0
-VER_BUGFIX = 1
+VER_BUGFIX = 2
 VER_BUILD = 0
 VER_STATUS = # Should be empty for stable releases!