diff --git a/.changes/2.25.0.md b/.changes/2.25.0.md
new file mode 100644
index 0000000000..f6e5542184
--- /dev/null
+++ b/.changes/2.25.0.md
@@ -0,0 +1,7 @@
+## 2.25.0 (February 15, 2023)
+
+BUG FIXES:
+
+* helper/schema: Allow diagnostic messages with incorrect UTF-8 encoding to pass through with the invalid sequences replaced with the Unicode Replacement Character. This avoids returning the unhelpful message "string field contains invalid UTF-8" in that case. ([#1111](https://github.com/hashicorp/terraform-plugin-sdk/issues/1111))
+* helper/schema: Prevented unexpected difference for timeouts on first plan after import ([#1146](https://github.com/hashicorp/terraform-plugin-sdk/issues/1146))
+
diff --git a/.changes/unreleased/BUG FIXES-20230203-162500.yaml b/.changes/unreleased/BUG FIXES-20230203-162500.yaml
deleted file mode 100644
index 005f6f3595..0000000000
--- a/.changes/unreleased/BUG FIXES-20230203-162500.yaml	
+++ /dev/null
@@ -1,8 +0,0 @@
-kind: BUG FIXES
-body: 'helper/schema: Allow diagnostic messages with incorrect UTF-8 encoding to pass
-  through with the invalid sequences replaced with the Unicode Replacement Character.
-  This avoids returning the unhelpful message "string field contains invalid UTF-8"
-  in that case.'
-time: 2023-02-03T16:25:00.97554-05:00
-custom:
-  Issue: "1111"
diff --git a/.changes/unreleased/BUG FIXES-20230213-150146.yaml b/.changes/unreleased/BUG FIXES-20230213-150146.yaml
deleted file mode 100644
index d3839ec759..0000000000
--- a/.changes/unreleased/BUG FIXES-20230213-150146.yaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: BUG FIXES
-body: 'helper/schema: Prevented unexpected difference for timeouts on first plan after
-  import'
-time: 2023-02-13T15:01:46.441029-05:00
-custom:
-  Issue: "1146"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fbef3ff3b..16f646441b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.25.0 (February 15, 2023)
+
+BUG FIXES:
+
+* helper/schema: Allow diagnostic messages with incorrect UTF-8 encoding to pass through with the invalid sequences replaced with the Unicode Replacement Character. This avoids returning the unhelpful message "string field contains invalid UTF-8" in that case. ([#1111](https://github.com/hashicorp/terraform-plugin-sdk/issues/1111))
+* helper/schema: Prevented unexpected difference for timeouts on first plan after import ([#1146](https://github.com/hashicorp/terraform-plugin-sdk/issues/1146))
+
 # 2.24.1 (November 14, 2022)
 
 BUG FIXES: