diff --git a/CHANGELOG.md b/CHANGELOG.md
index 445308d1853ab02bc4b16fe2c889faecb5049892..9844319e323d11c9eb0024d8cf13148d8fcdc747 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.7.1
+Bugfix release. Added small optimizations to emoji picker that should make it a bit more responsive, however it needs rather large change to make it more performant which might come in a major release.
+
+### Fixed
+- Instance default theme not respected
+- Nested panel header having wrong sticky position if navbar height != panel header height
+- Toggled buttons having bad contrast (when using v2 theme)
+
+### Changed
+- Simplify the OAuth client_name to 'PleromaFE'
+- Small optimizations to emoji picker
+
+
 ## 2.7.0
 
 ### Known issues
diff --git a/changelog.d/oauth-app-name.change b/changelog.d/oauth-app-name.change
deleted file mode 100644
index 15d6f87ee49d2b9c49dd473b595245dd52eb05e9..0000000000000000000000000000000000000000
--- a/changelog.d/oauth-app-name.change
+++ /dev/null
@@ -1 +0,0 @@
-Simplify the OAuth client_name to 'PleromaFE'
diff --git a/package.json b/package.json
index 822559147b6bf3c2e160d6a311e29f098a09d9d3..45b046603876b4530cd29caf5a7a845d8583e208 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Pleroma frontend, the default frontend of Pleroma social network server",
   "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
   "private": false,