diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 7dedcbadc8..e69de29bb2 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,9 +0,0 @@
-- Add: TextUnrestricted attribute type to avoid forbidden chars checking (#3550)
-- Add: notification flow control on update (#3568)
-- Fix: crash when using null character in some NGSIv1 operations
-- Fix: crash when using attributes with invalid JSON having more than one "value" keys (#3603)
-- Hardening: add deepness control to compound attribute and metadata value (max 50 levels) (related with #3605, #3606 and #3608)
-- Hardening: NULL control in some strdup and calloc cases (very unlikely, but theoretically possible) (#3578)
-- Hardening: avoid crash in the unlikely case MongoDB get databases operations fails in csubs cache refresh logic (#3456, partly)
-- Hardening: refactor mongo connection logic at startup to make it simpler
-- Change centos7.6.1810 to centos7.7.1908 in Dockerfile
diff --git a/README.md b/README.md
index 9072c88976..a53e7c7701 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![SOF support badge](https://nexus.lab.fiware.org/repository/raw/public/badges/stackoverflow/orion.svg)](http://stackoverflow.com/questions/tagged/fiware-orion)
 [![NGSI v2](https://nexus.lab.fiware.org/repository/raw/public/badges/specifications/ngsiv2.svg)](http://fiware-ges.github.io/orion/api/v2/stable/)
 <br>
-[![Documentation badge](https://img.shields.io/readthedocs/fiware-orion.svg)](https://fiware-orion.rtfd.io)
+[![Documentation badge](https://img.shields.io/readthedocs/fiware-orion/2.4.0.svg)](https://fiware-orion.rtfd.io/en/2.4.0/)
 [![Build badge](https://img.shields.io/travis/telefonicaid/fiware-orion.svg)](https://travis-ci.org/telefonicaid/fiware-orion/)
 ![Status](https://nexus.lab.fiware.org/static/badges/statuses/orion.svg)
 
diff --git a/rpm/SPECS/contextBroker.spec b/rpm/SPECS/contextBroker.spec
index 0897c2ca28..c61000ca05 100644
--- a/rpm/SPECS/contextBroker.spec
+++ b/rpm/SPECS/contextBroker.spec
@@ -176,6 +176,17 @@ if [ "$1" == "0" ]; then
 fi
 
 %changelog
+* Tue Mar 31 2020 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.4.0-1
+- Add: TextUnrestricted attribute type to avoid forbidden chars checking (#3550)
+- Add: notification flow control on update (#3568)
+- Fix: crash when using null character in some NGSIv1 operations
+- Fix: crash when using attributes with invalid JSON having more than one "value" keys (#3603)
+- Hardening: add deepness control to compound attribute and metadata value (max 50 levels) (related with #3605, #3606 and #3608)
+- Hardening: NULL control in some strdup and calloc cases (very unlikely, but theoretically possible) (#3578)
+- Hardening: avoid crash in the unlikely case MongoDB get databases operations fails in csubs cache refresh logic (#3456, partly)
+- Hardening: refactor mongo connection logic at startup to make it simpler
+- Change centos7.6.1810 to centos7.7.1908 in Dockerfile
+
 * Tue Nov 05 2019 Fermin Galan <fermin.galanmarquez@telefonica.com> 2.3.0-1
 - Add: basic NGSIv2 queries and updates forwarding (#3068)
 - Add: idPattern '.*' support in in NGSIv2 registrations (#3458)
diff --git a/src/app/contextBroker/version.h b/src/app/contextBroker/version.h
index 37675e910b..55dc674a30 100644
--- a/src/app/contextBroker/version.h
+++ b/src/app/contextBroker/version.h
@@ -28,6 +28,6 @@
 
 
 
-#define ORION_VERSION "2.3.0-next"
+#define ORION_VERSION "2.4.0"
 
 #endif  // SRC_APP_CONTEXTBROKER_VERSION_H_
diff --git a/src/lib/common/defaultValues.h b/src/lib/common/defaultValues.h
index 95998c82df..da734b03d4 100644
--- a/src/lib/common/defaultValues.h
+++ b/src/lib/common/defaultValues.h
@@ -41,6 +41,6 @@
 *
 * API Documentation - The link to the the GEri documentation, either in the gh-pages (.github.io/) inside the fiware organization in GitHub or ReadTheDocs manual.
 */
-#define API_DOC                               "https://fiware-orion.rtfd.io/"
+#define API_DOC                               "https://fiware-orion.rtfd.io/en/2.4.0/"
 
 #endif  // SRC_LIB_COMMON_DEFAULTVALUES_H_