diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d3b5d71fb..a9be169eb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,29 @@
+v2.1 (2024-05-29)
+-----------------
+
+New Features
+^^^^^^^^^^^^
+
+- Add function to calibrate event lists based on RMF file (`#804 <https://github.com/StingraySoftware/stingray/pull/804>`__)
+- Speed up computation of pds for large arrays (`#808 <https://github.com/StingraySoftware/stingray/pull/808>`__)
+- Add support for XTE science event data (`#816 <https://github.com/StingraySoftware/stingray/pull/816>`__)
+- A friendlier API for the non-paralyzable dead time model model (`#800 <https://github.com/StingraySoftware/stingray/pull/800>`__)
+
+Bug Fixes
+^^^^^^^^^
+
+- Fix issue when setting a property from a FITS file read (`#814 <https://github.com/StingraySoftware/stingray/pull/814>`__)
+- Fix case when analyze_segments has an invalid segment (`#822 <https://github.com/StingraySoftware/stingray/pull/822>`__)
+- Substitute np.asarray with np.asanyarray everywhere, to avoid copying memory maps into memory if possible (`#824 <https://github.com/StingraySoftware/stingray/pull/824>`__)
+
+
+Internal Changes
+^^^^^^^^^^^^^^^^
+
+- Dead time model fixes: more stable computations, better plotting of check_A and check_B (`#800 <https://github.com/StingraySoftware/stingray/pull/800>`__)
+- Bumped jinja version to 3.1.4 (`#825 <https://github.com/StingraySoftware/stingray/pull/825>`__)
+
+
 v2.0 (2024-03-13)
 -----------------
 
diff --git a/docs/changes/800.trivial.rst b/docs/changes/800.trivial.rst
deleted file mode 100644
index 52fa8810f..000000000
--- a/docs/changes/800.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Dead time model fixes: more stable computations, a friendlier API for the non-paralyzable model, better plotting of check_A and check_B
diff --git a/docs/changes/804.feature.rst b/docs/changes/804.feature.rst
deleted file mode 100644
index 1d2b04834..000000000
--- a/docs/changes/804.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add function to calibrate event lists based on RMF file
diff --git a/docs/changes/808.feature.rst b/docs/changes/808.feature.rst
deleted file mode 100644
index d33b9ae0c..000000000
--- a/docs/changes/808.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Speed up computation of pds for large arrays
diff --git a/docs/changes/814.bugfix.rst b/docs/changes/814.bugfix.rst
deleted file mode 100644
index d90606d64..000000000
--- a/docs/changes/814.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue when setting a property from a FITS file read
diff --git a/docs/changes/816.feature.rst b/docs/changes/816.feature.rst
deleted file mode 100644
index f40b9f688..000000000
--- a/docs/changes/816.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add support for XTE data
diff --git a/docs/changes/822.bugfix.rst b/docs/changes/822.bugfix.rst
deleted file mode 100644
index 06f526c55..000000000
--- a/docs/changes/822.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix case when analyze_segments has an invalid segment
diff --git a/docs/changes/824.bugfix.rst b/docs/changes/824.bugfix.rst
deleted file mode 100644
index 67c52da32..000000000
--- a/docs/changes/824.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Substitute np.asarray with np.asanyarray everywhere, to avoid copying memory maps into memory if possible
diff --git a/docs/changes/825.trivial.rst b/docs/changes/825.trivial.rst
deleted file mode 100644
index bbc425170..000000000
--- a/docs/changes/825.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bumped jinja version to 3.1.4