diff --git a/nextcloud.spec b/nextcloud.spec
index 4eeb387..4e1d7d0 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -1,5 +1,5 @@
 Name:           nextcloud
-Version:        21.0.2
+Version:        22.0.0
 Release:        1%{?dist}
 Summary:        Private file sync and share server
 License:        AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe
@@ -319,6 +319,7 @@ mv 3rdparty/php-http/httplug/LICENSE php-http-LICENSE
 mv 3rdparty/php-http/promise/LICENSE php-http-LICENSE
 mv 3rdparty/php-opencloud/openstack/LICENSE php-opencloud-LICENSE
 mv 3rdparty/phpseclib/phpseclib/LICENSE phpseclib-LICENSE
+mv 3rdparty/psr/event-dispatcher/LICENSE psr-LICENSE
 mv 3rdparty/psr/container/LICENSE psr-LICENSE
 mv 3rdparty/psr/http-client/LICENSE psr-LICENSE
 mv 3rdparty/psr/http-factory/LICENSE psr-LICENSE
@@ -361,18 +362,28 @@ mv 3rdparty/thecodingmachine/safe/LICENSE thecodingmachine-LICENSE
 mv 3rdparty/web-auth/cose-lib/LICENSE web-auth-LICENSE
 mv 3rdparty/web-auth/metadata-service/LICENSE web-auth-LICENSE
 mv 3rdparty/web-auth/webauthn-lib/LICENSE web-auth-LICENSE
+mv apps/activity/js/activity-sidebar.js.LICENSE.txt activity-sidebar.js-LICENSE
+mv apps/circles/LICENSE circles-LICENSE
 mv apps/cloud_federation_api/LICENSE cloud_federation_api-LICENSE
 mv apps/files_external/3rdparty/icewind/smb/LICENSE.txt icewind-LICENSE
 mv apps/files_external/3rdparty/icewind/streams/LICENCE icewind-LICENSE
+mv apps/files_pdfviewer/js/files_pdfviewer-workersrc.js.LICENSE.txt files_pdfviewer-workersrc.js-LICENSE
+mv apps/files_pdfviewer/js/files_pdfviewer-main.js.LICENSE.txt files_pdfviewer-main.js-LICENSE
+mv apps/files_pdfviewer/js/files_pdfviewer-public.js.LICENSE.txt files_pdfviewer-public.js-LICENSE
 mv apps/files_pdfviewer/js/pdfjs/LICENSE js-pdfjs-LICENSE
 mv apps/files_pdfviewer/js/pdfjs/web/cmaps/LICENSE js-pdfjs-cmaps-LICENSE
 mv apps/files_rightclick/COPYING files_rightclick-COPYING
 mv apps/files_rightclick/LICENSE files_rightclick-LICENSE
+mv apps/logreader/build/main.js.LICENSE.txt logreader-main.js-LICENSE
 mv apps/nextcloud_announcements/COPYING nextcloud_announcements-COPYING
 mv apps/notifications/COPYING notifications-LICENSE
+mv apps/notifications/js/notifications-main.js.LICENSE.txt notifications-main.js-LICENSE
 mv apps/password_policy/LICENSE password_policy-LICENSE
+mv apps/password_policy/js/password_policy-settings.js.LICENSE.txt password_policy-settings.js-LICENSE
 mv apps/photos/COPYING photos-COPYING
+mv apps/photos/js/photos-main.js.LICENSE.txt photos-main.js-LICENSE
 mv apps/privacy/COPYING privacy-COPYING
+mv apps/privacy/js/privacy-main.js.LICENSE.txt privacy-main.js-LICENSE
 mv apps/recommendations/LICENSE recommendations-LICENSE
 mv apps/serverinfo/COPYING serverinfo-LICENSE
 mv apps/survey_client/COPYING survey_client-LICENSE
@@ -380,6 +391,7 @@ mv apps/text/COPYING text-COPYING
 mv apps/theming/js/3rdparty/jscolor/LICENSE.txt jscolor-LICENSE
 mv apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE
 mv apps/viewer/COPYING viewer-COPYING
+mv apps/viewer/js/viewer-main.js.LICENSE.txt viewer-main.js-LICENSE
 mv COPYING nextcloud-LICENSE
 mv core/fonts/LICENSE_OFL.txt fonts-LICENSE
 mv core/vendor/zxcvbn/LICENSE.txt zxcvbn-LICENSE
@@ -506,6 +518,9 @@ fi
 
 
 %changelog
+* Tue Jul  6 2021 Christopher Engelhard <ce@lcts.de> - 22.0.0-1
+- Update to 22.0.0
+
 * Wed Jun 30 2021 Christopher Engelhard <ce@lcts.de> - 21.0.2-1
 - Update to 21.0.2, fixes RHBZ 1977202 / CVE-2021-22915
 - Include php-fpm config in httpd subpackage
diff --git a/sources b/sources
index e468890..8e94e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nextcloud-21.0.2.tar.bz2) = a222c55c7ff515b96b7c826da13ff1770f82bebda2e73df6bb31df635338155dff611a560b665b0e9b17f2d8f33132abf75ffa80e84f5a115ee5d8a4737b6795
+SHA512 (nextcloud-22.0.0.tar.bz2) = ced81296d1080cb224ac96df501721c1a16a8a83f9784ab281d97202ec6611173d60a6a87279e7f36b735a92dd010ed81b0c7561fc7dadde00df10f9b7711cec