diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 62ad4de64a..09a8f54c5d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ownCloud Android client application
+  Nextcloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   Copyright (C) 2012-2016 ownCloud Inc.
@@ -20,8 +20,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="10040004"
-    android:versionName="1.4.0 RC4">
+    android:versionCode="10040099"
+    android:versionName="1.4.0">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ea014d46..d37202df10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.4.0 (November)
+## 1.4.0 (December 8, 2016)
 
 - External SD card support
 - Auto Upload (Android 7+)
@@ -11,7 +11,7 @@
 - Sort favorite files first in list
 - Account switcher optimizations
 - Bugfixes and design improvements
-- update library to 1.0.9
+- Update library to 1.0.9
 
 ## 1.3.1 (September 20, 2016)
 
@@ -66,4 +66,4 @@
 
 ## 1.0.0 (June 12, 2016)
 
-- initial release of the Nextcloud Android app 
+- Initial release of the Nextcloud Android app