diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b972a235..dd0817a8b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,175 @@
+Changelog for reva 2.2.0 (2022-04-12)
+=======================================
+
+The following sections list the changes in reva 2.2.0 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #3373: Fix the permissions attribute in propfind responses
+ * Fix #2721: Fix locking and public link scope checker to make the WOPI server work
+ * Fix #2668: Minor cleanup
+ * Fix #2692: Ensure that the host in the ocs config endpoint has no protocol
+ * Fix #2709: Decomposed FS: return precondition failed if already locked
+ * Chg #2687: Allow link with no or edit permission
+ * Chg #2658: Small clean up of the ocdav code
+ * Enh #2691: Decomposed FS: return a reference to the parent
+ * Enh #2708: Rework LDAP configuration of user and group providers
+ * Enh #2665: Add embeddable ocdav go micro service
+ * Enh #2715: Introduced quicklinks
+ * Enh #3370: Enable all spaces members to list public shares
+ * Enh #3370: Enable space members to list shares inside the space
+ * Enh #2717: Add definitions for user and group events
+
+Details
+-------
+
+ * Bugfix #3373: Fix the permissions attribute in propfind responses
+
+   Fixed the permissions that are returned when doing a propfind on a project space.
+
+   https://github.com/owncloud/ocis/issues/3373
+   https://github.com/cs3org/reva/pull/2713
+
+ * Bugfix #2721: Fix locking and public link scope checker to make the WOPI server work
+
+   We've fixed the locking implementation to use the CS3api instead of the temporary opaque
+   values. We've fixed the scope checker on public links to allow the OpenInApp actions.
+
+   These fixes have been done to use the cs3org/wopiserver with REVA edge.
+
+   https://github.com/cs3org/reva/pull/2721
+
+ * Bugfix #2668: Minor cleanup
+
+   - The `chunk_folder` config option is unused - Prevent a panic when looking up spaces
+
+   https://github.com/cs3org/reva/pull/2668
+
+ * Bugfix #2692: Ensure that the host in the ocs config endpoint has no protocol
+
+   We've fixed the host info in the ocs config endpoint so that it has no protocol, as ownCloud 10
+   doesn't have it.
+
+   https://github.com/cs3org/reva/pull/2692
+   https://github.com/owncloud/ocis/pull/3113
+
+ * Bugfix #2709: Decomposed FS: return precondition failed if already locked
+
+   We've fixed the return code from permission denied to precondition failed if a user tries to
+   lock an already locked file.
+
+   https://github.com/cs3org/reva/pull/2709
+
+ * Change #2687: Allow link with no or edit permission
+
+   Allow the creation of links with no permissions. These can be used to navigate to a file that a
+   user has access to. Allow setting edit permission on single file links (create and delete are
+   still blocked) Introduce endpoint to get information about a given token
+
+   https://github.com/cs3org/reva/pull/2687
+
+ * Change #2658: Small clean up of the ocdav code
+
+   Cleaned up the ocdav code to make it more readable and in one case a bit faster.
+
+   https://github.com/cs3org/reva/pull/2658
+
+ * Enhancement #2691: Decomposed FS: return a reference to the parent
+
+   We've implemented the changes from cs3org/cs3apis#167 in the DecomposedFS, so that a stat on a
+   resource always includes a reference to the parent of the resource.
+
+   https://github.com/cs3org/reva/pull/2691
+
+ * Enhancement #2708: Rework LDAP configuration of user and group providers
+
+   We reworked to LDAP configuration of the LDAP user and group provider to share a common
+   configuration scheme. Additionally the LDAP configuration no longer relies on templating
+   LDAP filters in the configuration which is error prone and can be confusing. Additionally the
+   providers are now somewhat more flexible about the group membership schema. Instead of only
+   supporting RFC2307 (posixGroup) style groups. It's now possible to also use standard LDAP
+   groups (groupOfName/groupOfUniqueNames) which track group membership by DN instead of
+   username (the behaviour is switched automatically depending on the group_objectclass
+   setting).
+
+   The new LDAP configuration basically looks this:
+
+   ```ini [grpc.services.userprovider.drivers.ldap] uri="ldaps://localhost:636"
+   insecure=true user_base_dn="ou=testusers,dc=owncloud,dc=com"
+   group_base_dn="ou=testgroups,dc=owncloud,dc=com" user_filter=""
+   user_objectclass="posixAccount" group_filter="" group_objectclass="posixGroup"
+   bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin"
+   idp="http://localhost:20080"
+
+   [grpc.services.userprovider.drivers.ldap.user_schema] id="entryuuid"
+   displayName="displayName" userName="cn"
+
+   [grpc.services.userprovider.drivers.ldap.group_schema] id="entryuuid"
+   displayName="cn" groupName="cn" member="memberUID" ```
+
+   `uri` defines the LDAP URI of the destination Server
+
+   `insecure` allows to disable TLS Certifictate Validation (for development setups)
+
+   `user_base_dn`/`group_base_dn` define the search bases for users and groups
+
+   `user_filter`/`group_filter` allow to define additional LDAP filter of users and groups.
+   This could be e.g. `(objectclass=owncloud)` to match for an additional objectclass.
+
+   `user_objectclass`/`group_objectclass` define the main objectclass of Users and Groups.
+   These are used to construct the LDAP filters
+
+   `bind_username`/`bind_password` contain the authentication information for the LDAP
+   connections
+
+   The `user_schema` and `group_schema` sections define the mapping from CS3 user/group
+   attributes to LDAP Attributes
+
+   https://github.com/cs3org/reva/issues/2122
+   https://github.com/cs3org/reva/issues/2124
+   https://github.com/cs3org/reva/pull/2708
+
+ * Enhancement #2665: Add embeddable ocdav go micro service
+
+   The new `pkg/micro/ocdav` package implements a go micro compatible version of the ocdav
+   service.
+
+   https://github.com/cs3org/reva/pull/2665
+
+ * Enhancement #2715: Introduced quicklinks
+
+   We now support Quicklinks. When creating a link with flag "quicklink=true", no new link will be
+   created when a link already exists.
+
+   https://github.com/cs3org/reva/pull/2715
+
+ * Enhancement #3370: Enable all spaces members to list public shares
+
+   Enhanced the json and cs3 public share manager so that it lists shares in spaces for all members.
+
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2697
+
+ * Enhancement #3370: Enable space members to list shares inside the space
+
+   If there are shared resources in a space then all members are allowed to see those shares. The
+   json share manager was enhanced to check if the user is allowed to see a share by checking the
+   grants on a resource.
+
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2674
+   https://github.com/cs3org/reva/pull/2710
+
+ * Enhancement #2717: Add definitions for user and group events
+
+   Enhance the events package with definitions for user and group events.
+
+   https://github.com/cs3org/reva/pull/2717
+   https://github.com/cs3org/reva/pull/2724
+
+
 Changelog for reva 2.1.0 (2022-03-29)
 =======================================
 
diff --git a/RELEASE_DATE b/RELEASE_DATE
index 365c8ff59c..44966a151f 100644
--- a/RELEASE_DATE
+++ b/RELEASE_DATE
@@ -1 +1 @@
-2022-03-29
\ No newline at end of file
+2022-04-12
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 50aea0e7ab..e3a4f19336 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
\ No newline at end of file
+2.2.0
\ No newline at end of file
diff --git a/changelog/unreleased/alias-links.md b/changelog/2.2.0_2022-04-12/alias-links.md
similarity index 100%
rename from changelog/unreleased/alias-links.md
rename to changelog/2.2.0_2022-04-12/alias-links.md
diff --git a/changelog/unreleased/decomposed-fs-parent.md b/changelog/2.2.0_2022-04-12/decomposed-fs-parent.md
similarity index 100%
rename from changelog/unreleased/decomposed-fs-parent.md
rename to changelog/2.2.0_2022-04-12/decomposed-fs-parent.md
diff --git a/changelog/unreleased/fix-permissions-propfind.md b/changelog/2.2.0_2022-04-12/fix-permissions-propfind.md
similarity index 100%
rename from changelog/unreleased/fix-permissions-propfind.md
rename to changelog/2.2.0_2022-04-12/fix-permissions-propfind.md
diff --git a/changelog/unreleased/fix-wopi-on-edge.md b/changelog/2.2.0_2022-04-12/fix-wopi-on-edge.md
similarity index 100%
rename from changelog/unreleased/fix-wopi-on-edge.md
rename to changelog/2.2.0_2022-04-12/fix-wopi-on-edge.md
diff --git a/changelog/unreleased/ldap-config-rework.md b/changelog/2.2.0_2022-04-12/ldap-config-rework.md
similarity index 100%
rename from changelog/unreleased/ldap-config-rework.md
rename to changelog/2.2.0_2022-04-12/ldap-config-rework.md
diff --git a/changelog/unreleased/micro-ocdav.md b/changelog/2.2.0_2022-04-12/micro-ocdav.md
similarity index 100%
rename from changelog/unreleased/micro-ocdav.md
rename to changelog/2.2.0_2022-04-12/micro-ocdav.md
diff --git a/changelog/unreleased/minor-cleanup.md b/changelog/2.2.0_2022-04-12/minor-cleanup.md
similarity index 100%
rename from changelog/unreleased/minor-cleanup.md
rename to changelog/2.2.0_2022-04-12/minor-cleanup.md
diff --git a/changelog/unreleased/ocdav-cleanup.md b/changelog/2.2.0_2022-04-12/ocdav-cleanup.md
similarity index 100%
rename from changelog/unreleased/ocdav-cleanup.md
rename to changelog/2.2.0_2022-04-12/ocdav-cleanup.md
diff --git a/changelog/unreleased/ocs-ensure-host-no-protocol.md b/changelog/2.2.0_2022-04-12/ocs-ensure-host-no-protocol.md
similarity index 100%
rename from changelog/unreleased/ocs-ensure-host-no-protocol.md
rename to changelog/2.2.0_2022-04-12/ocs-ensure-host-no-protocol.md
diff --git a/changelog/unreleased/quicklinks.md b/changelog/2.2.0_2022-04-12/quicklinks.md
similarity index 100%
rename from changelog/unreleased/quicklinks.md
rename to changelog/2.2.0_2022-04-12/quicklinks.md
diff --git a/changelog/unreleased/set-lock-precondition.md b/changelog/2.2.0_2022-04-12/set-lock-precondition.md
similarity index 100%
rename from changelog/unreleased/set-lock-precondition.md
rename to changelog/2.2.0_2022-04-12/set-lock-precondition.md
diff --git a/changelog/unreleased/spaces-public-shares.md b/changelog/2.2.0_2022-04-12/spaces-public-shares.md
similarity index 100%
rename from changelog/unreleased/spaces-public-shares.md
rename to changelog/2.2.0_2022-04-12/spaces-public-shares.md
diff --git a/changelog/unreleased/spaces-shares.md b/changelog/2.2.0_2022-04-12/spaces-shares.md
similarity index 100%
rename from changelog/unreleased/spaces-shares.md
rename to changelog/2.2.0_2022-04-12/spaces-shares.md
diff --git a/changelog/unreleased/user-group-events.md b/changelog/2.2.0_2022-04-12/user-group-events.md
similarity index 100%
rename from changelog/unreleased/user-group-events.md
rename to changelog/2.2.0_2022-04-12/user-group-events.md
diff --git a/changelog/NOTE.md b/changelog/NOTE.md
index 019fec02b2..5c275010ff 100644
--- a/changelog/NOTE.md
+++ b/changelog/NOTE.md
@@ -1,202 +1,172 @@
-Changelog for reva 2.1.0 (2022-03-29)
+Changelog for reva 2.2.0 (2022-04-12)
 =======================================
 
-The following sections list the changes in reva 2.1.0 relevant to
+The following sections list the changes in reva 2.2.0 relevant to
 reva users. The changes are ordered by importance.
 
 Summary
 -------
 
- * Fix #2636: Delay reconnect log for events
- * Fix #2645: Avoid warning about missing .flock files
- * Fix #2625: Fix locking on publik links and the decomposed filesystem
- * Fix #2643: Emit linkaccessfailed event when share is nil
- * Fix #2646: Replace public mountpoint fileid with grant fileid in ocdav
- * Fix #2612: Adjust the scope handling to support the spaces architecture
- * Fix #2621: Send events only if response code is `OK`
- * Chg #2574: Switch NATS backend
- * Chg #2667: Allow LDAP groups to have no gidNumber
- * Chg #3233: Improve quota handling
- * Chg #2600: Use the cs3 share api to manage spaces
- * Enh #2644: Add new public share manager
- * Enh #2626: Add new share manager
- * Enh #2624: Add etags to virtual spaces
- * Enh #2639: File Events
- * Enh #2627: Add events for sharing action
- * Enh #2664: Add grantID to mountpoint
- * Enh #2622: Allow listing shares in spaces via the OCS API
- * Enh #2623: Add space aliases
- * Enh #2647: Add space specific events
- * Enh #3345: Add the spaceid to propfind responses
- * Enh #2616: Add etag to spaces response
- * Enh #2628: Add spaces aware trash-bin API
+ * Fix #3373: Fix the permissions attribute in propfind responses
+ * Fix #2721: Fix locking and public link scope checker to make the WOPI server work
+ * Fix #2668: Minor cleanup
+ * Fix #2692: Ensure that the host in the ocs config endpoint has no protocol
+ * Fix #2709: Decomposed FS: return precondition failed if already locked
+ * Chg #2687: Allow link with no or edit permission
+ * Chg #2658: Small clean up of the ocdav code
+ * Enh #2691: Decomposed FS: return a reference to the parent
+ * Enh #2708: Rework LDAP configuration of user and group providers
+ * Enh #2665: Add embeddable ocdav go micro service
+ * Enh #2715: Introduced quicklinks
+ * Enh #3370: Enable all spaces members to list public shares
+ * Enh #3370: Enable space members to list shares inside the space
+ * Enh #2717: Add definitions for user and group events
 
 Details
 -------
 
- * Bugfix #2636: Delay reconnect log for events
+ * Bugfix #3373: Fix the permissions attribute in propfind responses
 
-   Print reconnect information log only when reconnect time is bigger than a second
+   Fixed the permissions that are returned when doing a propfind on a project space.
 
-   https://github.com/cs3org/reva/pull/2636
+   https://github.com/owncloud/ocis/issues/3373
+   https://github.com/cs3org/reva/pull/2713
 
- * Bugfix #2645: Avoid warning about missing .flock files
+ * Bugfix #2721: Fix locking and public link scope checker to make the WOPI server work
 
-   These flock files appear randomly because of file locking. We can savely ignore them.
+   We've fixed the locking implementation to use the CS3api instead of the temporary opaque
+   values. We've fixed the scope checker on public links to allow the OpenInApp actions.
 
-   https://github.com/cs3org/reva/pull/2645
+   These fixes have been done to use the cs3org/wopiserver with REVA edge.
 
- * Bugfix #2625: Fix locking on publik links and the decomposed filesystem
+   https://github.com/cs3org/reva/pull/2721
 
-   We've fixed the behavior of locking on the decomposed filesystem, so that now app based locks
-   can be modified user independently (needed for WOPI integration). Also we added a check, if a
-   lock is already expired and if so, we lazily delete the lock. The InitiateUploadRequest now
-   adds the Lock to the upload metadata so that an upload to an locked file is possible.
+ * Bugfix #2668: Minor cleanup
 
-   We'v added the locking api requests to the public link scope checks, so that locking also can be
-   used on public links (needed for WOPI integration).
+   - The `chunk_folder` config option is unused - Prevent a panic when looking up spaces
 
-   https://github.com/cs3org/reva/pull/2625
+   https://github.com/cs3org/reva/pull/2668
 
- * Bugfix #2643: Emit linkaccessfailed event when share is nil
+ * Bugfix #2692: Ensure that the host in the ocs config endpoint has no protocol
 
-   The code no longer panics when a link access failed event has no share.
+   We've fixed the host info in the ocs config endpoint so that it has no protocol, as ownCloud 10
+   doesn't have it.
 
-   https://github.com/cs3org/reva/pull/2643
+   https://github.com/cs3org/reva/pull/2692
+   https://github.com/owncloud/ocis/pull/3113
 
- * Bugfix #2646: Replace public mountpoint fileid with grant fileid in ocdav
+ * Bugfix #2709: Decomposed FS: return precondition failed if already locked
 
-   We now show the same resoucre id for resources when accessing them via a public links as when
-   using a logged in user. This allows the web ui to start a WOPI session with the correct resource
-   id.
+   We've fixed the return code from permission denied to precondition failed if a user tries to
+   lock an already locked file.
 
-   https://github.com/cs3org/reva/issues/2635
-   https://github.com/cs3org/reva/pull/2646
+   https://github.com/cs3org/reva/pull/2709
 
- * Bugfix #2612: Adjust the scope handling to support the spaces architecture
+ * Change #2687: Allow link with no or edit permission
 
-   The scope authentication interceptors weren't updated to the spaces architecture and
-   couldn't authenticate some requests.
+   Allow the creation of links with no permissions. These can be used to navigate to a file that a
+   user has access to. Allow setting edit permission on single file links (create and delete are
+   still blocked) Introduce endpoint to get information about a given token
 
-   https://github.com/cs3org/reva/pull/2612
-
- * Bugfix #2621: Send events only if response code is `OK`
-
-   Before events middleware was sending events also when the resulting status code was not `OK`.
-   This is clearly a bug.
-
-   https://github.com/cs3org/reva/pull/2621
-
- * Change #2574: Switch NATS backend
-
-   We've switched the NATS backend from Streaming to JetStream, since NATS Streaming is
-   depreciated.
-
-   https://github.com/cs3org/reva/pull/2574
-
- * Change #2667: Allow LDAP groups to have no gidNumber
-
-   Similar to the user-provider allow a group to have no gidNumber. Assign a default in that case.
-
-   https://github.com/cs3org/reva/pull/2667
-
- * Change #3233: Improve quota handling
-
-   GetQuota now returns 0 when no quota was set instead of the disk size. Also added a new return
-   value for the remaining space which will either be quota - used bytes or if no quota was set the
-   free disk size.
-
-   https://github.com/owncloud/ocis/issues/3233
-   https://github.com/cs3org/reva/pull/2666
-   https://github.com/cs3org/reva/pull/2688
-
- * Change #2600: Use the cs3 share api to manage spaces
-
-   We now use the cs3 share Api to manage the space roles. We do not send the request to the share
-   manager, the permissions are stored in the storage provider
-
-   https://github.com/cs3org/reva/pull/2600
-   https://github.com/cs3org/reva/pull/2620
    https://github.com/cs3org/reva/pull/2687
 
- * Enhancement #2644: Add new public share manager
-
-   We added a new public share manager which uses the new metadata storage backend for persisting
-   the public share information.
+ * Change #2658: Small clean up of the ocdav code
 
-   https://github.com/cs3org/reva/pull/2644
+   Cleaned up the ocdav code to make it more readable and in one case a bit faster.
 
- * Enhancement #2626: Add new share manager
+   https://github.com/cs3org/reva/pull/2658
 
-   We added a new share manager which uses the new metadata storage backend for persisting the
-   share information.
+ * Enhancement #2691: Decomposed FS: return a reference to the parent
 
-   https://github.com/cs3org/reva/pull/2626
+   We've implemented the changes from cs3org/cs3apis#167 in the DecomposedFS, so that a stat on a
+   resource always includes a reference to the parent of the resource.
 
- * Enhancement #2624: Add etags to virtual spaces
+   https://github.com/cs3org/reva/pull/2691
 
-   The shares storage provider didn't include the etag in virtual spaces like the shares jail or
-   mountpoints.
+ * Enhancement #2708: Rework LDAP configuration of user and group providers
 
-   https://github.com/cs3org/reva/pull/2624
+   We reworked to LDAP configuration of the LDAP user and group provider to share a common
+   configuration scheme. Additionally the LDAP configuration no longer relies on templating
+   LDAP filters in the configuration which is error prone and can be confusing. Additionally the
+   providers are now somewhat more flexible about the group membership schema. Instead of only
+   supporting RFC2307 (posixGroup) style groups. It's now possible to also use standard LDAP
+   groups (groupOfName/groupOfUniqueNames) which track group membership by DN instead of
+   username (the behaviour is switched automatically depending on the group_objectclass
+   setting).
 
- * Enhancement #2639: File Events
+   The new LDAP configuration basically looks this:
 
-   Adds file based events. See `pkg/events/files.go` for full list
+   ```ini [grpc.services.userprovider.drivers.ldap] uri="ldaps://localhost:636"
+   insecure=true user_base_dn="ou=testusers,dc=owncloud,dc=com"
+   group_base_dn="ou=testgroups,dc=owncloud,dc=com" user_filter=""
+   user_objectclass="posixAccount" group_filter="" group_objectclass="posixGroup"
+   bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin"
+   idp="http://localhost:20080"
 
-   https://github.com/cs3org/reva/pull/2639
+   [grpc.services.userprovider.drivers.ldap.user_schema] id="entryuuid"
+   displayName="displayName" userName="cn"
 
- * Enhancement #2627: Add events for sharing action
+   [grpc.services.userprovider.drivers.ldap.group_schema] id="entryuuid"
+   displayName="cn" groupName="cn" member="memberUID" ```
 
-   Includes lifecycle events for shares and public links doesn't include federated sharing
-   events for now see full list of events in `pkg/events/types.go`
+   `uri` defines the LDAP URI of the destination Server
 
-   https://github.com/cs3org/reva/pull/2627
+   `insecure` allows to disable TLS Certifictate Validation (for development setups)
 
- * Enhancement #2664: Add grantID to mountpoint
+   `user_base_dn`/`group_base_dn` define the search bases for users and groups
 
-   We distinguish between the mountpoint of a share and the grant where the original file is
-   located on the storage.
+   `user_filter`/`group_filter` allow to define additional LDAP filter of users and groups.
+   This could be e.g. `(objectclass=owncloud)` to match for an additional objectclass.
 
-   https://github.com/cs3org/reva/pull/2664
+   `user_objectclass`/`group_objectclass` define the main objectclass of Users and Groups.
+   These are used to construct the LDAP filters
 
- * Enhancement #2622: Allow listing shares in spaces via the OCS API
+   `bind_username`/`bind_password` contain the authentication information for the LDAP
+   connections
 
-   Added a `space_ref` parameter to the list shares endpoints so that one can list shares inside of
-   spaces.
+   The `user_schema` and `group_schema` sections define the mapping from CS3 user/group
+   attributes to LDAP Attributes
 
-   https://github.com/cs3org/reva/pull/2622
+   https://github.com/cs3org/reva/issues/2122
+   https://github.com/cs3org/reva/issues/2124
+   https://github.com/cs3org/reva/pull/2708
 
- * Enhancement #2623: Add space aliases
+ * Enhancement #2665: Add embeddable ocdav go micro service
 
-   Space aliases can be used to resolve spaceIDs in a client.
+   The new `pkg/micro/ocdav` package implements a go micro compatible version of the ocdav
+   service.
 
-   https://github.com/cs3org/reva/pull/2623
+   https://github.com/cs3org/reva/pull/2665
 
- * Enhancement #2647: Add space specific events
+ * Enhancement #2715: Introduced quicklinks
 
-   See `pkg/events/spaces.go` for full list
+   We now support Quicklinks. When creating a link with flag "quicklink=true", no new link will be
+   created when a link already exists.
 
-   https://github.com/cs3org/reva/pull/2647
+   https://github.com/cs3org/reva/pull/2715
 
- * Enhancement #3345: Add the spaceid to propfind responses
+ * Enhancement #3370: Enable all spaces members to list public shares
 
-   Added the spaceid to propfind responses so that clients have the necessary data to send
-   subsequent requests.
+   Enhanced the json and cs3 public share manager so that it lists shares in spaces for all members.
 
-   https://github.com/owncloud/ocis/issues/3345
-   https://github.com/cs3org/reva/pull/2657
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2697
 
- * Enhancement #2616: Add etag to spaces response
+ * Enhancement #3370: Enable space members to list shares inside the space
 
-   Added the spaces etag to the response when listing spaces.
+   If there are shared resources in a space then all members are allowed to see those shares. The
+   json share manager was enhanced to check if the user is allowed to see a share by checking the
+   grants on a resource.
 
-   https://github.com/cs3org/reva/pull/2616
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2674
+   https://github.com/cs3org/reva/pull/2710
 
- * Enhancement #2628: Add spaces aware trash-bin API
+ * Enhancement #2717: Add definitions for user and group events
 
-   Added the webdav trash-bin endpoint for spaces.
+   Enhance the events package with definitions for user and group events.
 
-   https://github.com/cs3org/reva/pull/2628
+   https://github.com/cs3org/reva/pull/2717
+   https://github.com/cs3org/reva/pull/2724
 
 
diff --git a/docs/content/en/docs/changelog/2.2.0/_index.md b/docs/content/en/docs/changelog/2.2.0/_index.md
new file mode 100644
index 0000000000..b0b61f42ae
--- /dev/null
+++ b/docs/content/en/docs/changelog/2.2.0/_index.md
@@ -0,0 +1,181 @@
+
+---
+title: "v2.2.0"
+linkTitle: "v2.2.0"
+weight: 40
+description: >
+  Changelog for Reva v2.2.0 (2022-04-12)
+---
+
+Changelog for reva 2.2.0 (2022-04-12)
+=======================================
+
+The following sections list the changes in reva 2.2.0 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #3373: Fix the permissions attribute in propfind responses
+ * Fix #2721: Fix locking and public link scope checker to make the WOPI server work
+ * Fix #2668: Minor cleanup
+ * Fix #2692: Ensure that the host in the ocs config endpoint has no protocol
+ * Fix #2709: Decomposed FS: return precondition failed if already locked
+ * Chg #2687: Allow link with no or edit permission
+ * Chg #2658: Small clean up of the ocdav code
+ * Enh #2691: Decomposed FS: return a reference to the parent
+ * Enh #2708: Rework LDAP configuration of user and group providers
+ * Enh #2665: Add embeddable ocdav go micro service
+ * Enh #2715: Introduced quicklinks
+ * Enh #3370: Enable all spaces members to list public shares
+ * Enh #3370: Enable space members to list shares inside the space
+ * Enh #2717: Add definitions for user and group events
+
+Details
+-------
+
+ * Bugfix #3373: Fix the permissions attribute in propfind responses
+
+   Fixed the permissions that are returned when doing a propfind on a project space.
+
+   https://github.com/owncloud/ocis/issues/3373
+   https://github.com/cs3org/reva/pull/2713
+
+ * Bugfix #2721: Fix locking and public link scope checker to make the WOPI server work
+
+   We've fixed the locking implementation to use the CS3api instead of the temporary opaque
+   values. We've fixed the scope checker on public links to allow the OpenInApp actions.
+
+   These fixes have been done to use the cs3org/wopiserver with REVA edge.
+
+   https://github.com/cs3org/reva/pull/2721
+
+ * Bugfix #2668: Minor cleanup
+
+   - The `chunk_folder` config option is unused - Prevent a panic when looking up spaces
+
+   https://github.com/cs3org/reva/pull/2668
+
+ * Bugfix #2692: Ensure that the host in the ocs config endpoint has no protocol
+
+   We've fixed the host info in the ocs config endpoint so that it has no protocol, as ownCloud 10
+   doesn't have it.
+
+   https://github.com/cs3org/reva/pull/2692
+   https://github.com/owncloud/ocis/pull/3113
+
+ * Bugfix #2709: Decomposed FS: return precondition failed if already locked
+
+   We've fixed the return code from permission denied to precondition failed if a user tries to
+   lock an already locked file.
+
+   https://github.com/cs3org/reva/pull/2709
+
+ * Change #2687: Allow link with no or edit permission
+
+   Allow the creation of links with no permissions. These can be used to navigate to a file that a
+   user has access to. Allow setting edit permission on single file links (create and delete are
+   still blocked) Introduce endpoint to get information about a given token
+
+   https://github.com/cs3org/reva/pull/2687
+
+ * Change #2658: Small clean up of the ocdav code
+
+   Cleaned up the ocdav code to make it more readable and in one case a bit faster.
+
+   https://github.com/cs3org/reva/pull/2658
+
+ * Enhancement #2691: Decomposed FS: return a reference to the parent
+
+   We've implemented the changes from cs3org/cs3apis#167 in the DecomposedFS, so that a stat on a
+   resource always includes a reference to the parent of the resource.
+
+   https://github.com/cs3org/reva/pull/2691
+
+ * Enhancement #2708: Rework LDAP configuration of user and group providers
+
+   We reworked to LDAP configuration of the LDAP user and group provider to share a common
+   configuration scheme. Additionally the LDAP configuration no longer relies on templating
+   LDAP filters in the configuration which is error prone and can be confusing. Additionally the
+   providers are now somewhat more flexible about the group membership schema. Instead of only
+   supporting RFC2307 (posixGroup) style groups. It's now possible to also use standard LDAP
+   groups (groupOfName/groupOfUniqueNames) which track group membership by DN instead of
+   username (the behaviour is switched automatically depending on the group_objectclass
+   setting).
+
+   The new LDAP configuration basically looks this:
+
+   ```ini [grpc.services.userprovider.drivers.ldap] uri="ldaps://localhost:636"
+   insecure=true user_base_dn="ou=testusers,dc=owncloud,dc=com"
+   group_base_dn="ou=testgroups,dc=owncloud,dc=com" user_filter=""
+   user_objectclass="posixAccount" group_filter="" group_objectclass="posixGroup"
+   bind_username="cn=admin,dc=owncloud,dc=com" bind_password="admin"
+   idp="http://localhost:20080"
+
+   [grpc.services.userprovider.drivers.ldap.user_schema] id="entryuuid"
+   displayName="displayName" userName="cn"
+
+   [grpc.services.userprovider.drivers.ldap.group_schema] id="entryuuid"
+   displayName="cn" groupName="cn" member="memberUID" ```
+
+   `uri` defines the LDAP URI of the destination Server
+
+   `insecure` allows to disable TLS Certifictate Validation (for development setups)
+
+   `user_base_dn`/`group_base_dn` define the search bases for users and groups
+
+   `user_filter`/`group_filter` allow to define additional LDAP filter of users and groups.
+   This could be e.g. `(objectclass=owncloud)` to match for an additional objectclass.
+
+   `user_objectclass`/`group_objectclass` define the main objectclass of Users and Groups.
+   These are used to construct the LDAP filters
+
+   `bind_username`/`bind_password` contain the authentication information for the LDAP
+   connections
+
+   The `user_schema` and `group_schema` sections define the mapping from CS3 user/group
+   attributes to LDAP Attributes
+
+   https://github.com/cs3org/reva/issues/2122
+   https://github.com/cs3org/reva/issues/2124
+   https://github.com/cs3org/reva/pull/2708
+
+ * Enhancement #2665: Add embeddable ocdav go micro service
+
+   The new `pkg/micro/ocdav` package implements a go micro compatible version of the ocdav
+   service.
+
+   https://github.com/cs3org/reva/pull/2665
+
+ * Enhancement #2715: Introduced quicklinks
+
+   We now support Quicklinks. When creating a link with flag "quicklink=true", no new link will be
+   created when a link already exists.
+
+   https://github.com/cs3org/reva/pull/2715
+
+ * Enhancement #3370: Enable all spaces members to list public shares
+
+   Enhanced the json and cs3 public share manager so that it lists shares in spaces for all members.
+
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2697
+
+ * Enhancement #3370: Enable space members to list shares inside the space
+
+   If there are shared resources in a space then all members are allowed to see those shares. The
+   json share manager was enhanced to check if the user is allowed to see a share by checking the
+   grants on a resource.
+
+   https://github.com/owncloud/ocis/issues/3370
+   https://github.com/cs3org/reva/pull/2674
+   https://github.com/cs3org/reva/pull/2710
+
+ * Enhancement #2717: Add definitions for user and group events
+
+   Enhance the events package with definitions for user and group events.
+
+   https://github.com/cs3org/reva/pull/2717
+   https://github.com/cs3org/reva/pull/2724
+
+