diff --git a/CMakeModules/VersionConfiguration.cmake b/CMakeModules/VersionConfiguration.cmake
index edee662e6..aa3ff3f7d 100644
--- a/CMakeModules/VersionConfiguration.cmake
+++ b/CMakeModules/VersionConfiguration.cmake
@@ -21,7 +21,7 @@ else()
 endif()
 
 set(VERSION_MAJOR 2)
-set(VERSION_MINOR 39)
+set(VERSION_MINOR 40)
 set(VERSION_NANO 0)
 
 option(UPGRADE_DEBUG "" OFF)
diff --git a/release-notes/2.40.0.txt b/release-notes/2.40.0.txt
new file mode 100644
index 000000000..e60342f2d
--- /dev/null
+++ b/release-notes/2.40.0.txt
@@ -0,0 +1,17 @@
+2019-08-20
+
+NEW:
+
+- Improved sidebar pointer support
+- Renamed "Online Content" group to "Plex" in sidebar "More" menu and moved it after user servers
+
+FIXED:
+
+- Fixed size of related photos thumbnails in photo player
+- Fixed wrong playback titles being shown sometimes for video clips
+- Fixed hidden focus when going back from preplay
+- Fixed an issue that could cause albums and seasons lists to fail to load in artist and tv show pages
+- Fixed lyrics fetching error message flashing
+- Fixed wrong thumbnail image for photos in album list view
+- Fixed Preplay buttons too close to summary on preplay screen
+- Fixed sidebar customization being skipped for users with only one server and no enabled online media sources