diff --git a/.changelog/30793.txt b/.changelog/30793.txt
new file mode 100644
index 00000000000..d659458feca
--- /dev/null
+++ b/.changelog/30793.txt
@@ -0,0 +1,11 @@
+```release-note:enhancement
+provider: Duplicate `default_tags` can now be included and will be overwritten by resource `tags`
+```
+
+```release-note:enhancement
+provider: Allow `default_tags` and resource `tags` to include zero values `""`
+```
+
+```release-note:enhancement
+provider: Allow `computed` `tags` on resources
+```
\ No newline at end of file
diff --git a/website/docs/guides/version-5-upgrade.html.md b/website/docs/guides/version-5-upgrade.html.md
index 59819f7f9d9..74f4d3b367b 100644
--- a/website/docs/guides/version-5-upgrade.html.md
+++ b/website/docs/guides/version-5-upgrade.html.md
@@ -18,6 +18,7 @@ Upgrade topics:
 
 - [Provider Version Configuration](#provider-version-configuration)
 - [Provider Arguments](#provider-arguments)
+- [Default Tags](#default-tags)
 - [Data Source: aws_api_gateway_rest_api](#data-source-aws_api_gateway_rest_api)
 - [Data Source: aws_identitystore_group](#data-source-aws_identitystore_group)
 - [Data Source: aws_identitystore_user](#data-source-aws_identitystore_user)
@@ -162,6 +163,14 @@ The [`aws_redshift_service_account`](/docs/providers/aws/d/redshift_service_acco
 
 The `aws_subnet_ids` data source has been removed. Use the [`aws_subnets`](/docs/providers/aws/d/subnets.html) data source instead.
 
+## Default Tags
+
+The following enhancements are included:
+
+* Duplicate `default_tags` can now be included and will be overwritten by resource `tags`.
+* Zero value tags, `""`, can now be included in both `default_tags` and resource `tags`.
+* Tags can now be `computed`.
+
 ## EC2-Classic Retirement
 
 Following the retirement of EC2-Classic a number of resources and attributes have been removed.