diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index fca3ff4df..b5ae254b3 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -298,6 +298,7 @@ avoids filename clashes.
 Paperless provides the following placeholders withing filenames:
 
 * ``{correspondent}``: The name of the correspondent, or "none".
+* ``{document_type}``: The name of the document type, or "none".
 * ``{title}``: The title of the document.
 * ``{created}``: The full date and time the document was created.
 * ``{created_year}``: Year created only.
@@ -307,7 +308,6 @@ Paperless provides the following placeholders withing filenames:
 * ``{added_year}``: Year added only.
 * ``{added_month}``: Month added only (number 1-12).
 * ``{added_day}``: Day added only (number 1-31).
-* ``{tags}``: I don't know how this works. Look at the source.
 
 Paperless will convert all values for the placeholders into values which are safe
 for use in filenames.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b6c88be92..96578ac75 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,17 +14,20 @@ This release focusses primarily on many small issues with the UI.
 
   * Paperless now has proper window titles.
   * Fixed an issue with the small cards when more than 7 tags were used.
-  * Navigation of the "Show all" links adjusted.
+  * Navigation of the "Show all" links adjusted. They navigate to the saved view now, if available in the sidebar.
   * Some indication on the document lists that a filter is active was added.
   * There's a new filter to filter for documents that do *not* have a certain tag.
   * The file upload box now shows upload progress.
   * The document edit page was reorganized.
   * The document edit page shows various information about a document.
+  * An issue with the height of the preview was fixed.
   * Table issues with too long document titles fixed.
 
 * API
 
   * The API now serves file names with documents.
+  * The API now serves various metadata about documents.
+  * API documentation updated.
 
 * Other
 
@@ -35,6 +38,12 @@ This release focusses primarily on many small issues with the UI.
   * The filename formatter does not include the document ID in filenames anymore. It will
     rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
 
+.. note::
+
+  The changes to the filename format will apply to newly added documents and changed documents.
+  If you want all files to reflect these changes, execute the ``document_renamer`` management
+  command.
+
 
 paperless-ng 0.9.5
 ##################