diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf7490ed5..244c84921 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,12 @@
 ## 0.12.14 (Unreleased)
 
+UPGRADE NOTES:
+
+* The `terraform output` command formerly would treat no outputs at all as an error, exiting with a non-zero status. Since it's expected for some root modules to have no outputs, the command now returns with success status zero in this situation, but still returns the error on stderr as a compromise to provide an explanation for why nothing is being shown.
+
 ENHANCEMENTS:
 
+* command/output: Now treats no defined outputs as a success case rather than an error case, returning exit status zero instead of non-zero. [GH-23008]
 * backend/artifactory: Will now honor the `HTTP_PROXY` and `HTTPS_PROXY` environment variables when appropriate, to allow sending requests to the Artifactory endpoints via a proxy. [GH-18629]
 
 BUG FIXES: