diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f07cd8f4d..e35e34362c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ 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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.18.0] - 2021-05-05
+### Added
+- Patch endpoint for global configuration ([#1629](https://github.com/scm-manager/scm-manager/pull/1629))
+- Show hg binary verification error messages ([#1637](https://github.com/scm-manager/scm-manager/pull/1637))
+- Add global notifications ([#1646](https://github.com/scm-manager/scm-manager/pull/1646))
+- Add extension point for custom link protocol renderers in markdown ([#1639](https://github.com/scm-manager/scm-manager/pull/1639))
+
+### Fixed
+- Show correct default branch for repository if not configured yet ([#1643](https://github.com/scm-manager/scm-manager/pull/1643))
+- Flickering form elements on repository initialization ([#1644](https://github.com/scm-manager/scm-manager/issues/1644) and [#1645](https://github.com/scm-manager/scm-manager/issues/1645))
+- Messages from post commit hooks for git ([#1647](https://github.com/scm-manager/scm-manager/pull/1647))
+- External links and anchor links are now correctly rendered in markdown even if no base path is present ([#1639](https://github.com/scm-manager/scm-manager/pull/1639))
+
+### Changed
+- Show only relevant information on repository information page ([#1636](https://github.com/scm-manager/scm-manager/pull/1636))
+
 ## [2.17.1] - 2021-04-26
 ### Fixed
 - Deserialization of embedded values in HAL objects ([#1630](https://github.com/scm-manager/scm-manager/pull/1630))
@@ -605,3 +621,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.16.0]: https://www.scm-manager.org/download/2.16.0
 [2.17.0]: https://www.scm-manager.org/download/2.17.0
 [2.17.1]: https://www.scm-manager.org/download/2.17.1
+[2.18.0]: https://www.scm-manager.org/download/2.18.0
diff --git a/gradle/changelog/config_patch_endpoint.yaml b/gradle/changelog/config_patch_endpoint.yaml
deleted file mode 100644
index a59b95606e..0000000000
--- a/gradle/changelog/config_patch_endpoint.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: added
-  description: Patch endpoint for global configuration ([#1629](https://github.com/scm-manager/scm-manager/pull/1629))
diff --git a/gradle/changelog/flickering_repo_initializer.yaml b/gradle/changelog/flickering_repo_initializer.yaml
deleted file mode 100644
index 1fe5528cf2..0000000000
--- a/gradle/changelog/flickering_repo_initializer.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Flickering form elements on repository initialization ([#1644](https://github.com/scm-manager/scm-manager/issues/1644) and [#1645](https://github.com/scm-manager/scm-manager/issues/1645))
diff --git a/gradle/changelog/global_notifications.yaml b/gradle/changelog/global_notifications.yaml
deleted file mode 100644
index 3a0815e28c..0000000000
--- a/gradle/changelog/global_notifications.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: added
-  description: Add global notifications ([#1646](https://github.com/scm-manager/scm-manager/pull/1646))
diff --git a/gradle/changelog/hg_verification_error_messages.yaml b/gradle/changelog/hg_verification_error_messages.yaml
deleted file mode 100644
index fb0819ebbc..0000000000
--- a/gradle/changelog/hg_verification_error_messages.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: added
-  description: Show hg binary verification error messages ([#1637](https://github.com/scm-manager/scm-manager/pull/1637))
diff --git a/gradle/changelog/link-renderer.yaml b/gradle/changelog/link-renderer.yaml
deleted file mode 100644
index 1af474b840..0000000000
--- a/gradle/changelog/link-renderer.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: added
-  description: Add extension point for custom link protocol renderers in markdown ([#1639](https://github.com/scm-manager/scm-manager/pull/1639))
-- type: fixed
-  description: External links and anchor links are now correctly rendered in markdown even if no base path is present ([#1639](https://github.com/scm-manager/scm-manager/pull/1639))
diff --git a/gradle/changelog/post_commit_hook_messages_git.yaml b/gradle/changelog/post_commit_hook_messages_git.yaml
deleted file mode 100644
index 356760d4f3..0000000000
--- a/gradle/changelog/post_commit_hook_messages_git.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Messages from post commit hooks for git ([#1647](https://github.com/scm-manager/scm-manager/pull/1647))
diff --git a/gradle/changelog/repo_information_page.yaml b/gradle/changelog/repo_information_page.yaml
deleted file mode 100644
index 5ae408085f..0000000000
--- a/gradle/changelog/repo_information_page.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: changed
-  description: Show only relevant information on repository information page ([#1636](https://github.com/scm-manager/scm-manager/pull/1636))
diff --git a/gradle/changelog/wrong_default_branch_shown.yaml b/gradle/changelog/wrong_default_branch_shown.yaml
deleted file mode 100644
index 36fc7200ec..0000000000
--- a/gradle/changelog/wrong_default_branch_shown.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Show correct default branch for repository if not configured yet ([#1643](https://github.com/scm-manager/scm-manager/pull/1643))