diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index fb87b1107..c94edf53a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -5,7 +5,7 @@ endif::[]
 
 ////
 [[release-notes-x.x.x]]
-==== x.x.x - YYYY/MM/DD
+==== x.x.x - YYYY-MM-DD
 
 [float]
 ===== Breaking changes
@@ -32,6 +32,20 @@ endif::[]
 [[release-notes-6.x]]
 === Python Agent version 6.x
 
+[[release-notes-6.21.0]]
+==== 6.21.0 - 2024-03-06
+
+[float]
+===== Bug fixes
+
+* Fix starlette middleware setup without client argument {pull}1952[#1952]
+* Fix blocking of gRPC stream-to-stream requests {pull}1967[#1967]
+* Always take into account body reading time for starlette requests {pull}1970[#1970]
+* Make urllib3 transport tests more robust against local env {pull}1969[#1969]
+* Clarify starlette integration documentation {pull}1956[#1956]
+* Make dbapi2 query scanning for dollar quotes a bit more correct {pull}1976[#1976]
+* Normalize headers in AWS Lambda integration on API Gateway v1 requests {pull}1982[#1982]
+
 [[release-notes-6.20.0]]
 ==== 6.20.0 - 2024-01-10
 
diff --git a/elasticapm/version.py b/elasticapm/version.py
index ea64e853b..a48ac9368 100644
--- a/elasticapm/version.py
+++ b/elasticapm/version.py
@@ -28,5 +28,5 @@
 #  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = (6, 20, 0)
+__version__ = (6, 21, 0)
 VERSION = ".".join(map(str, __version__))