diff --git a/.chglog/README.md b/.chglog/README.md
index 48f775df0..85aba2d24 100644
--- a/.chglog/README.md
+++ b/.chglog/README.md
@@ -8,7 +8,7 @@ It is possible to test the tool by `git-chglog --init` without overriding anythi
 
 ## Usage
 
-Example for a new release "v2.3.0":
+Example for a new release "v2.4.0":
 
 ```sh
 # optional update tool by: go install github.com/git-chglog/git-chglog/cmd/git-chglog@latest
@@ -17,14 +17,14 @@ git pull
 git fetch --tags
 git checkout dev
 git pull upstream  dev
-git checkout -b rel/prepare_for_release_v230
-git-chglog --config .chglog/config_gobot.yml --no-case --next-tag v2.3.0 v2.2.0.. > .chglog/chglog_tmp.md
+git checkout -b rel/prepare_for_release_v240
+git-chglog --config .chglog/config_gobot.yml --no-case --next-tag v2.4.0 v2.3.0.. > .chglog/chglog_tmp.md
 ```
 
 ## Compare
 
 If unsure about any result of running git-chglog, just use:
-`git log  --since=2023-10-30 --pretty="- %s"`
+`git log  --since=2024-01-07 --pretty="- %s"`
 
 ## Manual adjustment
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45da52407..9a1389ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,51 @@
 # CHANGELOG
 
-## [Unreleased](https://github.com/hybridgroup/gobot/compare/v2.3.0...HEAD)
+## [Unreleased](https://github.com/hybridgroup/gobot/compare/v2.4.0...HEAD)
+
+## [v2.4.0](https://github.com/hybridgroup/gobot/compare/v2.3.0...v2.4.0) (2024-11-05)
+
+### Bebop
+
+* fix concurrent map writes ([#1063](https://github.com/hybridgroup/gobot/issues/1063))
+
+### Ble
+
+* add support for functional options, add tests ([#1059](https://github.com/hybridgroup/gobot/issues/1059))
+* introduce in drivers folder ([#1057](https://github.com/hybridgroup/gobot/issues/1057))
+* **client:** add scan timout ([#1051](https://github.com/hybridgroup/gobot/issues/1051))
+* **module:** update tinygo.org/x/bluetooth to v0.10 and adapt code ([#1084](https://github.com/hybridgroup/gobot/issues/1084))
+
+### Build
+
+* **go, deps:** switch to Go 1.22 and update modules, linter v1.61.0 and adapt code ([#1093](https://github.com/hybridgroup/gobot/issues/1093),[#1092](https://github.com/hybridgroup/gobot/issues/1092))
+* **go, deps:** switch to Go 1.20 and update modules ([#1067](https://github.com/hybridgroup/gobot/issues/1067))
+* **linter:** update linter to v1.56.1 and fix issues ([#1068](https://github.com/hybridgroup/gobot/issues/1068))
+
+### Doc
+
+* update links to release or tagged branch ([#1069](https://github.com/hybridgroup/gobot/issues/1069))
+* **core:** prepare for release v2.4.0
+
+### Examples
+
+* fix missing checks of return values ([#1060](https://github.com/hybridgroup/gobot/issues/1060))
+
+### Gobot
+
+* rename Master to Manager ([#1070](https://github.com/hybridgroup/gobot/issues/1070))
+
+### Megapi
+
+* use serialport adaptor and move driver to drivers/serial ([#1062](https://github.com/hybridgroup/gobot/issues/1062))
+
+### Neurosky
+
+* use serialport adaptor and move driver to drivers/serial ([#1061](https://github.com/hybridgroup/gobot/issues/1061))
+
+### Test
+
+* try to stabilize eventer tests ([#1066](https://github.com/hybridgroup/gobot/issues/1066))
+* try to stabilize firmata tests ([#1097](https://github.com/hybridgroup/gobot/issues/1097))
 
 ## [v2.3.0](https://github.com/hybridgroup/gobot/compare/v2.2.0...v2.3.0) (2024-01-06)