diff --git a/NEWS b/NEWS
index e3cf6feb..bc92c288 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-1.8.7.dev0
+1.8.7
  * #736: Store included configuration files within each backup archive in support of the "config
    bootstrap" action. Previously, only top-level configuration files were stored.
  * #798: Elevate specific Borg warnings to errors or squash errors to warnings.
diff --git a/docs/how-to/customize-warnings-and-errors.md b/docs/how-to/customize-warnings-and-errors.md
index 9f97e1a5..2088458d 100644
--- a/docs/how-to/customize-warnings-and-errors.md
+++ b/docs/how-to/customize-warnings-and-errors.md
@@ -40,6 +40,9 @@ borg_exit_codes:
 Be careful with this example though, because it prevents borgmatic from
 erroring when Borg errors, which may not be desirable.
 
+
+### More granular configuration
+
 <span class="minilink minilink-addedin">New in Borg version 1.4</span> Borg
 support for [more granular exit
 codes](https://borgbackup.readthedocs.io/en/1.4-maint/usage/general.html#return-codes)
diff --git a/setup.py b/setup.py
index adea55c4..b7d5b290 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = '1.8.7.dev0'
+VERSION = '1.8.7'
 
 
 setup(