diff --git a/VERSION b/VERSION
index 93a894495d..60c1d71035 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2024.06-dev
+2024.06-rc
diff --git a/database.sql b/database.sql
index eccec668fe..6c16deb30d 100644
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
 -- ------------------------------------------
--- Friendica 2024.06-dev (Yellow Archangel)
+-- Friendica 2024.06-rc (Yellow Archangel)
 -- DB_UPDATE_VERSION 1565
 -- ------------------------------------------
 
@@ -2034,7 +2034,7 @@ CREATE TABLE IF NOT EXISTS `worker-ipc` (
 -- VIEW application-view
 --
 DROP VIEW IF EXISTS `application-view`;
-CREATE VIEW `application-view` AS SELECT 
+CREATE VIEW `application-view` AS SELECT
 	`application`.`id` AS `id`,
 	`application-token`.`uid` AS `uid`,
 	`application`.`name` AS `name`,
@@ -2058,7 +2058,7 @@ CREATE VIEW `application-view` AS SELECT
 -- VIEW circle-member-view
 --
 DROP VIEW IF EXISTS `circle-member-view`;
-CREATE VIEW `circle-member-view` AS SELECT 
+CREATE VIEW `circle-member-view` AS SELECT
 	`group_member`.`id` AS `id`,
 	`group`.`uid` AS `uid`,
 	`group_member`.`contact-id` AS `contact-id`,
@@ -2089,7 +2089,7 @@ CREATE VIEW `circle-member-view` AS SELECT
 -- VIEW post-counts-view
 --
 DROP VIEW IF EXISTS `post-counts-view`;
-CREATE VIEW `post-counts-view` AS SELECT 
+CREATE VIEW `post-counts-view` AS SELECT
 	`post-counts`.`uri-id` AS `uri-id`,
 	`post-counts`.`vid` AS `vid`,
 	`verb`.`name` AS `verb`,
@@ -2103,7 +2103,7 @@ CREATE VIEW `post-counts-view` AS SELECT
 -- VIEW post-engagement-user-view
 --
 DROP VIEW IF EXISTS `post-engagement-user-view`;
-CREATE VIEW `post-engagement-user-view` AS SELECT 
+CREATE VIEW `post-engagement-user-view` AS SELECT
 	`post-thread-user`.`uid` AS `uid`,
 	`post-engagement`.`uri-id` AS `uri-id`,
 	`post-engagement`.`owner-id` AS `owner-id`,
@@ -2135,7 +2135,7 @@ CREATE VIEW `post-engagement-user-view` AS SELECT
 -- VIEW post-timeline-view
 --
 DROP VIEW IF EXISTS `post-timeline-view`;
-CREATE VIEW `post-timeline-view` AS SELECT 
+CREATE VIEW `post-timeline-view` AS SELECT
 	`post-user`.`uid` AS `uid`,
 	`post-user`.`uri-id` AS `uri-id`,
 	`post-user`.`gravity` AS `gravity`,
@@ -2180,7 +2180,7 @@ CREATE VIEW `post-timeline-view` AS SELECT
 -- VIEW post-timeline-origin-view
 --
 DROP VIEW IF EXISTS `post-timeline-origin-view`;
-CREATE VIEW `post-timeline-origin-view` AS SELECT 
+CREATE VIEW `post-timeline-origin-view` AS SELECT
 	`post-origin`.`uid` AS `uid`,
 	`post-origin`.`uri-id` AS `uri-id`,
 	`post-origin`.`gravity` AS `gravity`,
@@ -2226,7 +2226,7 @@ CREATE VIEW `post-timeline-origin-view` AS SELECT
 -- VIEW post-searchindex-user-view
 --
 DROP VIEW IF EXISTS `post-searchindex-user-view`;
-CREATE VIEW `post-searchindex-user-view` AS SELECT 
+CREATE VIEW `post-searchindex-user-view` AS SELECT
 	`post-thread-user`.`uid` AS `uid`,
 	`post-searchindex`.`uri-id` AS `uri-id`,
 	`post-searchindex`.`owner-id` AS `owner-id`,
@@ -2258,7 +2258,7 @@ CREATE VIEW `post-searchindex-user-view` AS SELECT
 -- VIEW post-origin-view
 --
 DROP VIEW IF EXISTS `post-origin-view`;
-CREATE VIEW `post-origin-view` AS SELECT 
+CREATE VIEW `post-origin-view` AS SELECT
 	`post-origin`.`id` AS `id`,
 	`post-origin`.`id` AS `post-user-id`,
 	`post-origin`.`uid` AS `uid`,
@@ -2446,7 +2446,7 @@ CREATE VIEW `post-origin-view` AS SELECT
 -- VIEW post-thread-origin-view
 --
 DROP VIEW IF EXISTS `post-thread-origin-view`;
-CREATE VIEW `post-thread-origin-view` AS SELECT 
+CREATE VIEW `post-thread-origin-view` AS SELECT
 	`post-origin`.`id` AS `id`,
 	`post-origin`.`id` AS `post-user-id`,
 	`post-origin`.`uid` AS `uid`,
@@ -2632,7 +2632,7 @@ CREATE VIEW `post-thread-origin-view` AS SELECT
 -- VIEW post-user-view
 --
 DROP VIEW IF EXISTS `post-user-view`;
-CREATE VIEW `post-user-view` AS SELECT 
+CREATE VIEW `post-user-view` AS SELECT
 	`post-user`.`id` AS `id`,
 	`post-user`.`id` AS `post-user-id`,
 	`post-user`.`uid` AS `uid`,
@@ -2819,7 +2819,7 @@ CREATE VIEW `post-user-view` AS SELECT
 -- VIEW post-thread-user-view
 --
 DROP VIEW IF EXISTS `post-thread-user-view`;
-CREATE VIEW `post-thread-user-view` AS SELECT 
+CREATE VIEW `post-thread-user-view` AS SELECT
 	`post-user`.`id` AS `id`,
 	`post-user`.`id` AS `post-user-id`,
 	`post-thread-user`.`uid` AS `uid`,
@@ -3004,7 +3004,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 -- VIEW post-view
 --
 DROP VIEW IF EXISTS `post-view`;
-CREATE VIEW `post-view` AS SELECT 
+CREATE VIEW `post-view` AS SELECT
 	`item-uri`.`uri` AS `uri`,
 	`post`.`uri-id` AS `uri-id`,
 	`parent-item-uri`.`uri` AS `parent-uri`,
@@ -3151,7 +3151,7 @@ CREATE VIEW `post-view` AS SELECT
 -- VIEW post-thread-view
 --
 DROP VIEW IF EXISTS `post-thread-view`;
-CREATE VIEW `post-thread-view` AS SELECT 
+CREATE VIEW `post-thread-view` AS SELECT
 	`item-uri`.`uri` AS `uri`,
 	`post-thread`.`uri-id` AS `uri-id`,
 	`parent-item-uri`.`uri` AS `parent-uri`,
@@ -3299,7 +3299,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 -- VIEW category-view
 --
 DROP VIEW IF EXISTS `category-view`;
-CREATE VIEW `category-view` AS SELECT 
+CREATE VIEW `category-view` AS SELECT
 	`post-category`.`uri-id` AS `uri-id`,
 	`post-category`.`uid` AS `uid`,
 	`post-category`.`type` AS `type`,
@@ -3313,7 +3313,7 @@ CREATE VIEW `category-view` AS SELECT
 -- VIEW collection-view
 --
 DROP VIEW IF EXISTS `collection-view`;
-CREATE VIEW `collection-view` AS SELECT 
+CREATE VIEW `collection-view` AS SELECT
 	`post-collection`.`uri-id` AS `uri-id`,
 	`post-collection`.`type` AS `type`,
 	`post-collection`.`author-id` AS `cid`,
@@ -3334,7 +3334,7 @@ CREATE VIEW `collection-view` AS SELECT
 -- VIEW media-view
 --
 DROP VIEW IF EXISTS `media-view`;
-CREATE VIEW `media-view` AS SELECT 
+CREATE VIEW `media-view` AS SELECT
 	`post-media`.`uri-id` AS `uri-id`,
 	`post-media`.`type` AS `type`,
 	`post`.`received` AS `received`,
@@ -3352,7 +3352,7 @@ CREATE VIEW `media-view` AS SELECT
 -- VIEW tag-view
 --
 DROP VIEW IF EXISTS `tag-view`;
-CREATE VIEW `tag-view` AS SELECT 
+CREATE VIEW `tag-view` AS SELECT
 	`post-tag`.`uri-id` AS `uri-id`,
 	`post-tag`.`type` AS `type`,
 	`post-tag`.`tid` AS `tid`,
@@ -3368,7 +3368,7 @@ CREATE VIEW `tag-view` AS SELECT
 -- VIEW network-thread-view
 --
 DROP VIEW IF EXISTS `network-thread-view`;
-CREATE VIEW `network-thread-view` AS SELECT 
+CREATE VIEW `network-thread-view` AS SELECT
 	`post-thread-user`.`uri-id` AS `uri-id`,
 	`post-thread-user`.`post-user-id` AS `parent`,
 	`post-thread-user`.`received` AS `received`,
@@ -3396,7 +3396,7 @@ CREATE VIEW `network-thread-view` AS SELECT
 -- VIEW network-thread-circle-view
 --
 DROP VIEW IF EXISTS `network-thread-circle-view`;
-CREATE VIEW `network-thread-circle-view` AS SELECT 
+CREATE VIEW `network-thread-circle-view` AS SELECT
 	`post-thread-user`.`uri-id` AS `uri-id`,
 	`post-thread-user`.`post-user-id` AS `parent`,
 	`post-thread-user`.`received` AS `received`,
@@ -3424,7 +3424,7 @@ CREATE VIEW `network-thread-circle-view` AS SELECT
 -- VIEW owner-view
 --
 DROP VIEW IF EXISTS `owner-view`;
-CREATE VIEW `owner-view` AS SELECT 
+CREATE VIEW `owner-view` AS SELECT
 	`contact`.`id` AS `id`,
 	`contact`.`uid` AS `uid`,
 	`contact`.`created` AS `created`,
@@ -3552,7 +3552,7 @@ CREATE VIEW `owner-view` AS SELECT
 -- VIEW account-view
 --
 DROP VIEW IF EXISTS `account-view`;
-CREATE VIEW `account-view` AS SELECT 
+CREATE VIEW `account-view` AS SELECT
 	`contact`.`id` AS `id`,
 	`contact`.`url` AS `url`,
 	`contact`.`nurl` AS `nurl`,
@@ -3640,7 +3640,7 @@ CREATE VIEW `account-view` AS SELECT
 -- VIEW account-user-view
 --
 DROP VIEW IF EXISTS `account-user-view`;
-CREATE VIEW `account-user-view` AS SELECT 
+CREATE VIEW `account-user-view` AS SELECT
 	`ucontact`.`id` AS `id`,
 	`contact`.`id` AS `pid`,
 	`ucontact`.`uid` AS `uid`,
@@ -3746,7 +3746,7 @@ CREATE VIEW `account-user-view` AS SELECT
 -- VIEW pending-view
 --
 DROP VIEW IF EXISTS `pending-view`;
-CREATE VIEW `pending-view` AS SELECT 
+CREATE VIEW `pending-view` AS SELECT
 	`register`.`id` AS `id`,
 	`register`.`hash` AS `hash`,
 	`register`.`created` AS `created`,
@@ -3768,7 +3768,7 @@ CREATE VIEW `pending-view` AS SELECT
 -- VIEW tag-search-view
 --
 DROP VIEW IF EXISTS `tag-search-view`;
-CREATE VIEW `tag-search-view` AS SELECT 
+CREATE VIEW `tag-search-view` AS SELECT
 	`post-tag`.`uri-id` AS `uri-id`,
 	`post-user`.`uid` AS `uid`,
 	`post-user`.`id` AS `iid`,
@@ -3790,7 +3790,7 @@ CREATE VIEW `tag-search-view` AS SELECT
 -- VIEW workerqueue-view
 --
 DROP VIEW IF EXISTS `workerqueue-view`;
-CREATE VIEW `workerqueue-view` AS SELECT 
+CREATE VIEW `workerqueue-view` AS SELECT
 	`process`.`pid` AS `pid`,
 	`workerqueue`.`priority` AS `priority`
 	FROM `process`
@@ -3801,7 +3801,7 @@ CREATE VIEW `workerqueue-view` AS SELECT
 -- VIEW profile_field-view
 --
 DROP VIEW IF EXISTS `profile_field-view`;
-CREATE VIEW `profile_field-view` AS SELECT 
+CREATE VIEW `profile_field-view` AS SELECT
 	`profile_field`.`id` AS `id`,
 	`profile_field`.`uid` AS `uid`,
 	`profile_field`.`label` AS `label`,
@@ -3821,7 +3821,7 @@ CREATE VIEW `profile_field-view` AS SELECT
 -- VIEW diaspora-contact-view
 --
 DROP VIEW IF EXISTS `diaspora-contact-view`;
-CREATE VIEW `diaspora-contact-view` AS SELECT 
+CREATE VIEW `diaspora-contact-view` AS SELECT
 	`diaspora-contact`.`uri-id` AS `uri-id`,
 	`item-uri`.`uri` AS `url`,
 	`item-uri`.`guid` AS `guid`,
diff --git a/src/App.php b/src/App.php
index 6673ec7914..73fc77a066 100644
--- a/src/App.php
+++ b/src/App.php
@@ -64,7 +64,7 @@ class App
 {
 	const PLATFORM = 'Friendica';
 	const CODENAME = 'Yellow Archangel';
-	const VERSION  = '2024.06-dev';
+	const VERSION  = '2024.06-rc';
 
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index f73892cf43..c6b0535610 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2024.06-dev\n"
+"Project-Id-Version: 2024.06-rc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-06-02 07:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"