diff --git a/NEWS b/NEWS
index 908b77b285736bc3beb1da114f94e94e1b019f23..7390c3433dee854cb6d436847484ee51016257fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Changes between 3.6.0 Beta 6 and 3.6.0:
+------------------
+ * Improve the orientation user experience in the video player
+ * Behavior and crash fixes
+
 Changes between 3.6.0 Beta 5 and 3.6.0 Beta 6:
 ------------------
  * Fix the remote access not included in the app bundle
diff --git a/build.gradle b/build.gradle
index 74ddc8eaca8baa14a9e0bc11d6bc24b01e1d469a..1db80d7528218ffe863e7c845ce531ed29f92d04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ allprojects {
 
 ext {
     appId = "org.videolan.vlc"
-    versionCode = 3050760
-    versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.6.0 Beta 6'
+    versionCode = 3060000
+    versionName = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? '4.0.0-preview - ' + versionCode : '3.6.0'
     vlcMajorVersion = project.hasProperty('forceVlc4') && project.getProperty('forceVlc4') ? 4 : 3
     remoteAccessVersion = '0.1.2'
     libvlcVersion = vlcMajorVersion == 3 ? '3.6.0-eap14' :'4.0.0-eap17'