diff --git a/Makefile b/Makefile
index cab461f..a75cf89 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 #
 VERSION_MAJOR			:= 2
 VERSION_MINOR			:= 8
-VERSION_PATCH			:= 29
+VERSION_PATCH			:= 30
 VERSION				:= ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
 
 # Default goal is build all images
diff --git a/docs/change-log.md b/docs/change-log.md
index 9425029..0d0dd1c 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,58 @@
 This document contains a summary of the new features, changes, fixes and known
 issues in each release of Trusted Firmware-A.
 
+## [lts-2.8.30](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.29..refs/tags/lts-v2.8.30) (2025-02-21)
+
+### Code Refactoring
+
+- **Services**
+
+  - **ERRATA ABI**
+
+    - move EXTRACT_PARTNUM to arch.h ([1a2a268](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/1a2a26897d84300174689f2c8f924bf8bd616d4e))
+
+- **Libraries**
+
+  - **EL3 Runtime**
+
+    - **Context Management**
+
+      - move remaining EL2 save/restore into C ([37db9ab](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/37db9abefe1d29b07d8fc392cf28e39ef6816388))
+
+### Resolved Issues
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - workaround for accessing ICH_VMCR_EL2 ([8c6068f](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/8c6068fab4886de9fc929eb31deb27c540612393))
+    - workaround for Cortex-A710 erratum 3701772 ([c32e3a3](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/c32e3a38dde1f6b2205af1f8387b033dcd85c65b))
+    - workaround for Cortex-A715 erratum 3699560 ([3b8a3ad](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/3b8a3ad1508fdcfef7f3487da5a32636b0bc4ada))
+    - workaround for Cortex-A720 erratum 3699561 ([c7d5de9](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/c7d5de9fe3031e315ec91bc1b4d1a62361ce89e0))
+    - workaround for Cortex-X2 erratum 3701772 ([2296df6](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/2296df6febef9bbac508182cf4aefa5882984e39))
+    - workaround for Cortex-X3 erratum 3701769 ([ed4bd3c](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/ed4bd3c61b3bb57fddb93dd4d49d205f59636d38))
+    - workaround for Cortex-X4 erratum 3701758 ([395f67e](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/395f67e871ad0d73f71a7858bc05fd7d6161abc7))
+    - workaround for Neoverse-N2 erratum 3701773 ([2414a85](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/2414a852a0c862e51f0fff4f20afa69eff424d99))
+    - workaround for Neoverse-V3 erratum 3701767 ([35caff9](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/35caff9793f1a484db908f8df4e54141d90dd61e))
+
+  - **EL3 Runtime**
+
+    - **Context Management**
+
+      - update gic el2 sysregs save/restore mechanism ([f2a263e](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/f2a263ed806f8364a107ec67746ba9e231c3114b))
+
+### Miscellaneous
+
+- **Libraries**
+
+  - **CPU Support**
+
+    - fix incorrect header macro ([983f4c8](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/983f4c8edf46a8c05662787b9a6e5f87ff6247b6))
+
+  - **SMCCC**
+
+    - bump up SMCCC version to 1.4 ([55589ce](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/55589ce2921099d9250c8e6a0184c9a19f77e803))
+
 ## [lts-2.8.29](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.28..refs/tags/lts-v2.8.29) (2025-02-14)
 
 ### ⚠ BREAKING CHANGES
diff --git a/docs/conf.py b/docs/conf.py
index 9040ad9..b39659c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,8 +14,8 @@
 
 project = "Trusted Firmware-A"
 author = "Trusted Firmware-A contributors"
-version = "2.8.29"
-release = "2.8.29"
+version = "2.8.30"
+release = "2.8.30"
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/package-lock.json b/package-lock.json
index 06f82e2..9a0ef34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.29",
+  "version": "2.8.30",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trusted-firmware-a",
-      "version": "2.8.29",
+      "version": "2.8.30",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "devDependencies": {
diff --git a/package.json b/package.json
index bd9e055..8162051 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted-firmware-a",
-  "version": "2.8.29",
+  "version": "2.8.30",
   "license": "BSD-3-Clause",
   "type": "module",
   "private": true,
diff --git a/pyproject.toml b/pyproject.toml
index bec4962..6f148d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trusted-firmware-a"
-version = "2.8.29"
+version = "2.8.30"
 description = "Trusted Firmware-A (TF-A) Python dependencies."
 authors = ["Arm Ltd."]
 license = "BSD-3-Clause"
diff --git a/readme.rst b/readme.rst
index ff7bb56..0d71781 100644
--- a/readme.rst
+++ b/readme.rst
@@ -62,3 +62,4 @@
 
 
 
+
diff --git a/tools/conventional-changelog-tf-a/package.json b/tools/conventional-changelog-tf-a/package.json
index f59a866..59849a6 100644
--- a/tools/conventional-changelog-tf-a/package.json
+++ b/tools/conventional-changelog-tf-a/package.json
@@ -1,6 +1,6 @@
 {
   "name": "conventional-changelog-tf-a",
-  "version": "2.8.29",
+  "version": "2.8.30",
   "license": "BSD-3-Clause",
   "private": true,
   "main": "index.js",