diff --git a/CHANGELOG.md b/CHANGELOG.md
index f17cedc..2a0417c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.5.0
+
+### Added
+
+- Validate module configuration in admin panel to check if everything is set up properly.
+- Send return shipment labels to the customer email address.
+- Select delivery locations of type _Parcel Shop_ (Paketshop) for orders with DHL Paket shipping method.
+- Show metapackage version number in the _Post & DHL Shipping General Configuration_ group.
+- Specify the email notification address for the _DHL Paket Parcel Outlet Routing_ service in packaging popup.
+- Import _Return Receiver IDs_ configuration setting via CSV file.
+
+### Changed
+
+- Set selected delivery location as order shipping address.
+- Configure the shipping method name as displayed in checkout in the DHL Parcel Germany _Checkout Presentation_ config group.
+- Set the title of the _DHL Parcel Germany Returns_ carrier in its _General Settings_ config group.
+- Show selected shipping product (instead of carrier title) as track title in the _Shipping and Tracking Information_ section of a shipment.
+
+### Removed
+
+- Obsolete _DHL Parcel Germany Returns_ config fields were removed.
+
+### Fixed
+
+- Display selected delivery location in checkout progress sidebar.
+
 ## 2.4.0
 
 ### Added
diff --git a/composer.json b/composer.json
index cddce3f..49000b1 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "dhl/shipping-m2",
     "description": "DHL multi-division shipping extension for Magento 2",
     "type": "metapackage",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "license": "OSL-3.0",
     "require": {
         "deutschepost/module-autocomplete-m2": "~1.2.1",
@@ -12,10 +12,5 @@
         "dhl/module-carrier-paket-returns": "~2.1.0",
         "netresearch/module-interactive-batch-processing": "~1.0.0",
         "netresearch/module-shipping-ui": "~2.2.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-release-2.5.0": "2.5.0.x-dev"
-        }
     }
 }