diff --git a/README.md b/README.md
index 6780341eb..1c07d3ea8 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This code also generates the NextCloudPi docker images for [ARM](https://hub.doc
 ## Features
 
  * Debian/Raspbian 9 stretch
- * Nextcloud 15.0.2
+ * Nextcloud 15.0.4
  * Apache 2.4.25, with HTTP2 enabled
  * PHP 7.2
  * MariaDB 10
diff --git a/bin/ncp/CONFIG/nc-autoupdate-nc.sh b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
index 94609f237..8cfa1375b 100644
--- a/bin/ncp/CONFIG/nc-autoupdate-nc.sh
+++ b/bin/ncp/CONFIG/nc-autoupdate-nc.sh
@@ -10,7 +10,7 @@
 
 
 # just change this value and re-activate in update.sh to upgrade users
-VERSION=15.0.2
+VERSION=15.0.4
 
 configure() 
 {
diff --git a/bin/ncp/TOOLS/nc-update-nextcloud.sh b/bin/ncp/TOOLS/nc-update-nextcloud.sh
index 7f0bb5af9..5640e7da4 100644
--- a/bin/ncp/TOOLS/nc-update-nextcloud.sh
+++ b/bin/ncp/TOOLS/nc-update-nextcloud.sh
@@ -8,7 +8,7 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-LATEST=15.0.2
+LATEST=15.0.4
 
 configure()
 {
diff --git a/changelog.md b/changelog.md
index 68656f627..3ea55ee30 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.5.2](https://github.com/nextcloud/nextcloudpi/commit/244e340) (2019-02-07) nc-trusted-domains: add description
+[v1.6.0](https://github.com/nextcloud/nextcloudpi/commit/5118ddc) (2019-02-07) upgrade to NC15.0.4
+
+[v1.5.2  ](https://github.com/nextcloud/nextcloudpi/commit/1a6b7df) (2019-02-07) nc-trusted-domains: add description
 
 [v1.5.1  ](https://github.com/nextcloud/nextcloudpi/commit/a1842bc) (2019-01-30) nc-update-nc-apps-auto: log upgrades
 
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index 27217d848..e59080a65 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "15.0.2"
+      "value": "15.0.4"
     },
     {
       "id": "BETA",