diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1343a0f04b..4a0f2c9438 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to FairRoot will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## 18.8.2 - 2023-03-01
+
+### Bug fixes
+* Fix wrong init order in eventdisplay.
+* Fix GeoAssembly bounding box after alignment:
+  * Use ROOT expert patch.
+* Fix to obtain initial random seed from TRandom::GetSeed():
+  * Replace TRandom3::GetSeed() with the GetSeed() from base class.
+* Adopt new software versions:
+  * Fix FindROOT.cmake to work with ROOT v6.30.00.
+  * Adopt CMake policies up to 3.27.
+  * Support yaml-cpp 0.8+.
+  * Fix runtime error with XCode 13.3+.
+
+### Other Notable Changes
+* Software recongnition:
+  * Implement fair-software.eu badges
+  * Add codemeta.json in accordance with ESCAPE
+  * Add config for zenodo.org
+
 ## 18.8.1 - 2023-02-24
 
 ### Breaking Changes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a5b86e171..d888dc3734 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_policy(VERSION 3.15...3.27)
 
 set(PROJECT_MIN_CXX_STANDARD 17)
 
-project(FairRoot VERSION 18.8.1)
+project(FairRoot VERSION 18.8.2)
 
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/private")
diff --git a/codemeta.json b/codemeta.json
index f7d55aa455..6737b23fcc 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -4,7 +4,7 @@
   "name": "FairRoot",
   "description": "<p>A simulation, reconstruction and analysis framework that is based on the ROOT system. The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however the user code that creates simulated data do not depend on a particular monte carlo engine. The framework delivers base classes which enable the users to construct their detectors and /or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover an interface for reading magnetic field maps is also implemented.</p>",
   "license": "https://spdx.org/licenses/LGPL-3.0-only",
-  "softwareVersion": "18.8.1",
+  "softwareVersion": "18.8.2",
   "datePublished": "2012-05-25",
   "keywords": [
     "geant4",