diff --git a/ChangeLog b/ChangeLog
index 39bfbda..35ebc94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 fsarchiver: Filesystem Archiver for Linux [http://www.fsarchiver.org]
 =====================================================================
+* 0.8.7 (2023-03-19):
+  - Implement support for option "uuid=" for vfat (Marcos Mello)
+  - Update list of btrfs supported features (Marcos Mello)
+  - Add support for the "nrext64" feature on XFS (Marcos Mello)
+  - Do not error out on deleted files when option -A is used (Marcos Mello)
+  - Handle termination by signal in exec_command() (Marcos Mello)
+  - Add support for the "orphan_file" feature in EXT4 (Marcos Mello)
+  - Do not try to save xattrs if not supported by the filesystem (Marcos Mello)
 * 0.8.6 (2021-02-27):
   - Add support for EXT4 fast_commit feature (Marcos Mello)
   - Add support for XFS features inobtcount and bigtime (Marcos Mello)
diff --git a/configure.ac b/configure.ac
index 094d993..2948877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([fsarchiver], 0.8.7-git)
-AC_DEFINE([PACKAGE_RELDATE], "YYYY-MM-DD", [Define the date of the release])
+AC_INIT([fsarchiver], 0.8.7)
+AC_DEFINE([PACKAGE_RELDATE], "2023-03-19", [Define the date of the release])
 AC_DEFINE([PACKAGE_FILEFMT], "FsArCh_002", [Define the version of the file format])
 AC_DEFINE([PACKAGE_VERSION_A], 0, [Major version number])
 AC_DEFINE([PACKAGE_VERSION_B], 8, [Medium version number])
diff --git a/distrib/rpm/fsarchiver.spec b/distrib/rpm/fsarchiver.spec
index 66ad4b0..7e0a5fc 100644
--- a/distrib/rpm/fsarchiver.spec
+++ b/distrib/rpm/fsarchiver.spec
@@ -1,5 +1,5 @@
 Name:		fsarchiver
-Version:	0.8.6
+Version:	0.8.7
 Release:	1%{?dist}
 Summary:	Safe and flexible file-system backup/deployment tool