diff --git a/changelog/unreleased/archiver-capabilities-limits.md b/changelog/unreleased/archiver-capabilities-limits.md
new file mode 100644
index 0000000000..68f70374fa
--- /dev/null
+++ b/changelog/unreleased/archiver-capabilities-limits.md
@@ -0,0 +1,8 @@
+Enhancement: Add maximum files and size to archiver capabilities
+
+We added the maximum files count and maximum archive size of the archiver to the capabilities endpoint.
+Clients can use this to generate warnings before the actual archive creation fails.
+
+https://github.com/owncloud/ocis/pull/2544
+https://github.com/owncloud/ocis/issues/2537
+https://github.com/cs3org/reva/pull/2105
diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go
index aee7807741..06ef62c91a 100644
--- a/storage/pkg/command/frontend.go
+++ b/storage/pkg/command/frontend.go
@@ -56,10 +56,12 @@ func Frontend(cfg *config.Config) *cli.Command {
 
 			archivers := []map[string]interface{}{
 				{
-					"enabled":      true,
-					"version":      "2.0.0",
-					"formats":      []string{"tar", "zip"},
-					"archiver_url": cfg.Reva.Archiver.ArchiverURL,
+					"enabled":       true,
+					"version":       "2.0.0",
+					"formats":       []string{"tar", "zip"},
+					"archiver_url":  cfg.Reva.Archiver.ArchiverURL,
+					"max_num_files": cfg.Reva.Archiver.MaxNumFiles,
+					"max_size":      cfg.Reva.Archiver.MaxSize,
 				},
 			}