diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 189c2463935d6ebfa4635e07bac4302eaa983743..f1bb943f0fdc1ba370e42a835037bfe9aa2927a7 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230803
+20230804
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 786fbdad4614f79b914f57b0302a972e6c450a9f..cddb586c3d4ac5d2544a4f5fb45349664823a3fc 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-03  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-03  Richard Biener  <rguenther@suse.de>
+
+	* zstdtest.c (test_samples): Properly compute the allocation
+	size for the uncompressed data.
+
 2023-07-27  Release Manager
 
 	* GCC 13.2.0 released.