diff --git a/.travis.yml b/.travis.yml
index 8cbbd546be00cef863ce4f55b3f57bbbd4479db9..62d928e2aae6cdb5429556fe6c0951e1964484fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,9 @@ matrix:
     - php: 7.1
       env: "DB=mysql PHP_COVERAGE=TRUE"
     - php: 7.3
-      env: "DB=sqlite CORE_BRANCH=v16.0.0beta3"
+      env: "DB=sqlite CORE_BRANCH=stable16"
     - php: 7.3
-      env: "DB=pgsql CORE_BRANCH=v16.0.0alpha1"
+      env: "DB=pgsql CORE_BRANCH=v16.0.0RC1"
   fast_finish: true
 
 branches:
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 33ed09d575359b53b3f79f24cc1f3c1e9730b0ec..3408aa021b51ae506fed8252a3a40cd016e58d3e 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -22,7 +22,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/mail/74e94da16618b32ee0834e57bbfc83ff7334f709/screenshots/mail.png</screenshot>
 	<dependencies>
 		<php min-version="7.1" max-version="7.3" />
-		<nextcloud min-version="16" max-version="16" />
+		<nextcloud min-version="16" max-version="17" />
 	</dependencies>
 	<repair-steps>
 		<post-migration>
diff --git a/composer.json b/composer.json
index e43e865a18fefc267c666febd8def8d184319d56..7afe3ecf138e662d4420e4c0eab51b1c984655c7 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
 		"arthurhoaro/favicon": "^1.2"
 	},
 	"require-dev": {
-		"christophwurst/nextcloud": "v16.0.0-beta3",
+		"christophwurst/nextcloud": "v16.0.0-RC1",
 		"christophwurst/nextcloud_testing": "0.5.1",
 		"phan/phan": "^1.2"
 	},
diff --git a/composer.lock b/composer.lock
index 8ae9f2a20fa8a0f534fed4c8ac32b2517810c44d..d454c12f0d516a165d9eb81b6cdfad3f9500ee41 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4d3611a11bad0f7b824fc99fc60643d6",
+    "content-hash": "c212255482b4af527782596ad1016f5d",
     "packages": [
         {
             "name": "arthurhoaro/favicon",
@@ -844,16 +844,16 @@
     "packages-dev": [
         {
             "name": "christophwurst/nextcloud",
-            "version": "v16.0.0-beta3",
+            "version": "v16.0.0-RC1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "69332fc5190a4c209669a3933e7ca1767a292e7a"
+                "reference": "dd3131cef901825cbbdedb25c0ff50d28fea2fec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/69332fc5190a4c209669a3933e7ca1767a292e7a",
-                "reference": "69332fc5190a4c209669a3933e7ca1767a292e7a",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/dd3131cef901825cbbdedb25c0ff50d28fea2fec",
+                "reference": "dd3131cef901825cbbdedb25c0ff50d28fea2fec",
                 "shasum": ""
             },
             "require": {
@@ -876,7 +876,7 @@
                 }
             ],
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
-            "time": "2019-04-08T08:10:16+00:00"
+            "time": "2019-04-12T06:01:46+00:00"
         },
         {
             "name": "christophwurst/nextcloud_testing",
@@ -3152,7 +3152,7 @@
         "pear-pear.horde.org/horde_util": 0,
         "pear-pear.horde.org/horde_smtp": 0,
         "kwi/urllinker": 20,
-        "christophwurst/nextcloud": 10
+        "christophwurst/nextcloud": 5
     },
     "prefer-stable": false,
     "prefer-lowest": false,