diff --git a/Changelog.md b/Changelog.md
index 21ce7b62..c8bfd64c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,55 @@
 # Changelog
 
+## v0.34.0
+
+*Mar 31, 2022*
+
+- French translation (#1440): The UI is now available in French!
+  Thanks to @jgirardet.
+- Link Items (#528): Link items together directly (without using
+  custom fields) and see all related items quickly on the search page.
+- Import mails recursively (#1260): The scanmailbox task can now go
+  through folders recursively. Thanks to @Moerfi666 and @seijikun.
+- Fulltext search via PostgreSQL (#424): Another backend for full-text
+  search was added that is backed by PostgreSQL's text search feature.
+  You can now choose between SOLR and PostgreSQL for fulltext search.
+- More file backends (#1379): Next to storing the files in the
+  database, you can now choose to store them in a S3 compatible
+  storage or use the filesystem directly.
+- Flat zip upload (#1366): An option has been added to the upload
+  metadata that will unpack zip files and process each entry
+  separately (instead of treating a zip file as a single item).
+- Fix to upload large files (#1339): Uploaded files are not loaded
+  entirely into memory allowing to upload large files.
+- Fix previously published db migration (#1454, #1436): Unfortunately,
+  there was an db migration in the last release that caused problems
+  on some installations. A fix for this migration has been added.
+- Fix build to run on windows (#1449, #1461): Building docspell on
+  windows has been improved by @arittner.
+
+For some of the new features, you need the new version of
+[dsc](https://github.com/docspell/dsc).
+
+### Rest API Changes
+
+- adds routes to clone file repositories and the integrity check
+- adds routes to support linking items
+- `ScanMailboxSettings` has a new flag `scanRecursively`
+- `ItemDetail` and `ItemLight` contain a new field to transport
+  related/linked items
+- `ItemUploadMeta` has a new flag to specify whether zip files should
+  be treated as a container only, and be "flattened" into the list of
+  uploaded files
+
+### Configuration Changes
+
+- rest server only: added options to tune the http server
+- joex only: adds a file integrity check to the regular house keeping tasks
+- configuration for postgresql based full-text search
+- extend `files` config adding the different storage backends for
+  files
+
+
 ## v0.33.0
 
 *Mar 6, 2022*
diff --git a/website/site/content/docs/faq/_index.md b/website/site/content/docs/faq/_index.md
index 02c409b8..f1e4c2fa 100644
--- a/website/site/content/docs/faq/_index.md
+++ b/website/site/content/docs/faq/_index.md
@@ -11,12 +11,17 @@ template = "docs.html"
 
 ## Where are my files stored?
 
-Everything, including all files, are stored in the database.
+Everything, including all files, are stored in the database by
+default.
 
-Now that seems to put off some people coming to Docspell, so here are
-some thoughts on why this is and why it may be not such a big deal. It
-was a conscious decision and the option to hold all files in the file
-system was considered, but not chosen in the end.
+For the files there are alternatives: you can configure a S3 storage
+and even using the filesystem directly is possible. I wouldn't
+recommend the latter, especially not if networks are between the
+nodes. The recommended default is using the database, as it was the
+only way until 0.34.0, thus the others are not well battle tested.
+
+Here are some thoughts on why the decision was made for using the
+database only previous to 0.34.0.
 
 First, it was clear that a database *is* required in order to support
 the planned features. It is required to efficiently support a
diff --git a/website/site/content/docs/features/_index.md b/website/site/content/docs/features/_index.md
index 272aec9f..e56f8fab 100644
--- a/website/site/content/docs/features/_index.md
+++ b/website/site/content/docs/features/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Features and Limitations"
+title = "Features"
 weight = 9
 insert_anchor_links = "right"
 description = "A list of features and limitations."
@@ -14,8 +14,9 @@ template = "docs.html"
 - Handle multiple documents as one unit
 - OCR using [tesseract](https://github.com/tesseract-ocr/tesseract)
 - [Full-Text Search](@/docs/webapp/finding.md#full-text-search) based
-  on [Apache SOLR](https://solr.apache.org) or [PostgreSQL's text
-  search](https://www.postgresql.org/docs/14/textsearch.html)
+  on [Apache SOLR](@/docs/configure/fulltext-search.md#solr) or
+  [PostgreSQL's text
+  search](@/docs/configure/fulltext-search.md#postgresql)
 - Conversion to PDF: all files are converted into a PDF file. PDFs
   with only images (as often returned from scanners) are converted
   into searchable PDF/A pdfs.
@@ -64,6 +65,9 @@ template = "docs.html"
 - Everything stored in a SQL database: PostgreSQL, MariaDB or H2
   - H2 is embedded, a "one-file-only" database, avoids installing db
     servers
+- Choose a [file backend](@/docs/configure/file-backends.md) to store
+  files right in the database, in a S3 compatible storage or also use
+  the filesystem directly
 - Support for encrypted PDFs
 - Files supported:
   - Documents:
diff --git a/website/site/content/docs/feed/_index.md b/website/site/content/docs/feed/_index.md
index 96efb1fa..313e7ae8 100644
--- a/website/site/content/docs/feed/_index.md
+++ b/website/site/content/docs/feed/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Feed Data into Docspell"
+title = "Documents → Docspell"
 weight = 8
 description = "Shows several ways for getting data into Docspell."
 insert_anchor_links = "right"