diff --git a/.changes/0.22.1.md b/.changes/0.22.1.md
new file mode 100644
index 000000000..6d97d072b
--- /dev/null
+++ b/.changes/0.22.1.md
@@ -0,0 +1,10 @@
+## 0.22.1 (March 11, 2024)
+
+NOTES:
+
+* all: Upgraded google.golang.org/protobuf dependency, which includes a fix for CVE-2024-24786. While the fixed feature is not used in this Go module, this upgrade may silence security vulnerability scanner reports that are based purely on dependency versions. ([#385](https://github.com/hashicorp/terraform-plugin-go/issues/385))
+
+BUG FIXES:
+
+* tftypes: Fixed an edge-case where `(Value).Equal` would panic when comparing two values with underlying `DynamicPseudoType` types and different concrete values. ([#383](https://github.com/hashicorp/terraform-plugin-go/issues/383))
+
diff --git a/.changes/unreleased/BUG FIXES-20240228-171104.yaml b/.changes/unreleased/BUG FIXES-20240228-171104.yaml
deleted file mode 100644
index 698f25f12..000000000
--- a/.changes/unreleased/BUG FIXES-20240228-171104.yaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: BUG FIXES
-body: 'tftypes: Fixed an edge-case where `(Value).Equal` would panic when comparing
-  two values with underlying `DynamicPseudoType` types and different concrete values.'
-time: 2024-02-28T17:11:04.381759-05:00
-custom:
-  Issue: "383"
diff --git a/.changes/unreleased/NOTES-20240307-092813.yaml b/.changes/unreleased/NOTES-20240307-092813.yaml
deleted file mode 100644
index 20baf9527..000000000
--- a/.changes/unreleased/NOTES-20240307-092813.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-kind: NOTES
-body: 'all: Upgraded google.golang.org/protobuf dependency, which includes a fix for
-  CVE-2024-24786. While the fixed feature is not used in this Go module, this
-  upgrade may silence security vulnerability scanner reports that are based purely
-  on dependency versions.'
-time: 2024-03-07T09:28:13.859378-05:00
-custom:
-  Issue: "385"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e92692d8e..ecc185c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.22.1 (March 11, 2024)
+
+NOTES:
+
+* all: Upgraded google.golang.org/protobuf dependency, which includes a fix for CVE-2024-24786. While the fixed feature is not used in this Go module, this upgrade may silence security vulnerability scanner reports that are based purely on dependency versions. ([#385](https://github.com/hashicorp/terraform-plugin-go/issues/385))
+
+BUG FIXES:
+
+* tftypes: Fixed an edge-case where `(Value).Equal` would panic when comparing two values with underlying `DynamicPseudoType` types and different concrete values. ([#383](https://github.com/hashicorp/terraform-plugin-go/issues/383))
+
 ## 0.22.0 (February 22, 2024)
 
 BREAKING CHANGES: