diff --git a/.changeset/rude-weeks-beg.md b/.changeset/rude-weeks-beg.md
deleted file mode 100644
index 77fe423c6..000000000
--- a/.changeset/rude-weeks-beg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`ERC2771Context` and `Context`: Introduce a `_contextPrefixLength()` getter, used to trim extra information appended to `msg.data`.
diff --git a/.changeset/strong-points-invent.md b/.changeset/strong-points-invent.md
deleted file mode 100644
index 980000c42..000000000
--- a/.changeset/strong-points-invent.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`Multicall`: Make aware of non-canonical context (i.e. `msg.sender` is not `_msgSender()`), allowing compatibility with `ERC2771Context`.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec0209d58..a1d9afff1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 
+## 4.9.4 (2023-12-07)
+
+- `ERC2771Context` and `Context`: Introduce a `_contextPrefixLength()` getter, used to trim extra information appended to `msg.data`.
+- `Multicall`: Make aware of non-canonical context (i.e. `msg.sender` is not `_msgSender()`), allowing compatibility with `ERC2771Context`.
+
 ## 4.9.3 (2023-07-28)
 
 - `ERC2771Context`: Return the forwarder address whenever the `msg.data` of a call originating from a trusted forwarder is not long enough to contain the request signer address (i.e. `msg.data.length` is less than 20 bytes), as specified by ERC-2771. ([#4481](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4481))
diff --git a/contracts/metatx/ERC2771Context.sol b/contracts/metatx/ERC2771Context.sol
index 6acfadffd..913022cd4 100644
--- a/contracts/metatx/ERC2771Context.sol
+++ b/contracts/metatx/ERC2771Context.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.3) (metatx/ERC2771Context.sol)
+// OpenZeppelin Contracts (last updated v4.9.4) (metatx/ERC2771Context.sol)
 
 pragma solidity ^0.8.9;
 
diff --git a/contracts/package.json b/contracts/package.json
index 9412b0770..43969eaed 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openzeppelin/contracts",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.3",
+  "version": "4.9.4",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",
diff --git a/contracts/token/ERC20/extensions/ERC20Permit.sol b/contracts/token/ERC20/extensions/ERC20Permit.sol
index bc60e3a52..4a83b96e1 100644
--- a/contracts/token/ERC20/extensions/ERC20Permit.sol
+++ b/contracts/token/ERC20/extensions/ERC20Permit.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.0) (token/ERC20/extensions/ERC20Permit.sol)
+// OpenZeppelin Contracts (last updated v4.9.4) (token/ERC20/extensions/ERC20Permit.sol)
 
 pragma solidity ^0.8.0;
 
diff --git a/contracts/token/ERC20/extensions/IERC20Permit.sol b/contracts/token/ERC20/extensions/IERC20Permit.sol
index 3ffafcc38..ec2b5483c 100644
--- a/contracts/token/ERC20/extensions/IERC20Permit.sol
+++ b/contracts/token/ERC20/extensions/IERC20Permit.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.0) (token/ERC20/extensions/IERC20Permit.sol)
+// OpenZeppelin Contracts (last updated v4.9.4) (token/ERC20/extensions/IERC20Permit.sol)
 
 pragma solidity ^0.8.0;
 
diff --git a/contracts/utils/Context.sol b/contracts/utils/Context.sol
index 5c0b261f2..8e410bda1 100644
--- a/contracts/utils/Context.sol
+++ b/contracts/utils/Context.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (utils/Context.sol)
+// OpenZeppelin Contracts (last updated v4.9.4) (utils/Context.sol)
 
 pragma solidity ^0.8.0;
 
diff --git a/contracts/utils/Multicall.sol b/contracts/utils/Multicall.sol
index 88573a8a6..c59874fe5 100644
--- a/contracts/utils/Multicall.sol
+++ b/contracts/utils/Multicall.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.9.0) (utils/Multicall.sol)
+// OpenZeppelin Contracts (last updated v4.9.4) (utils/Multicall.sol)
 
 pragma solidity ^0.8.0;
 
diff --git a/package.json b/package.json
index 5e72e7347..5a738e859 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openzeppelin-solidity",
   "description": "Secure Smart Contract library for Solidity",
-  "version": "4.9.3",
+  "version": "4.9.4",
   "files": [
     "/contracts/**/*.sol",
     "/build/contracts/*.json",