diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7133a3cd..0ddbb61a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.21.5] - 2024-05-08 15:07:51
+
+### Fixed
+
+- Bug in macro cache logic.
+
 ## [2.21.4] - 2024-05-08 13:39:53
 
 ### Added
@@ -658,6 +664,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+[2.21.5]: https://github.com/PolicyEngine/policyengine-core/compare/2.21.4...2.21.5
 [2.21.4]: https://github.com/PolicyEngine/policyengine-core/compare/2.21.3...2.21.4
 [2.21.3]: https://github.com/PolicyEngine/policyengine-core/compare/2.21.2...2.21.3
 [2.21.2]: https://github.com/PolicyEngine/policyengine-core/compare/2.21.1...2.21.2
diff --git a/changelog.yaml b/changelog.yaml
index db39397a..428062ea 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -551,3 +551,8 @@
     removed:
     - Removed `.vscode` folder from the repository.
   date: 2024-05-08 13:39:53
+- bump: patch
+  changes:
+    fixed:
+    - Bug in macro cache logic.
+  date: 2024-05-08 15:07:51
diff --git a/changelog_entry.yaml b/changelog_entry.yaml
index 6c91b247..e69de29b 100644
--- a/changelog_entry.yaml
+++ b/changelog_entry.yaml
@@ -1,4 +0,0 @@
-- bump: patch
-  changes:
-    fixed:
-    - Bug in macro cache logic.
diff --git a/setup.py b/setup.py
index b644e22e..ea1d453c 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@
 
 setup(
     name="policyengine-core",
-    version="2.21.4",
+    version="2.21.5",
     author="PolicyEngine",
     author_email="hello@policyengine.org",
     classifiers=[