diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 19d30f166542ce85a823a3e2a9f0a84943a5873d..6a5191bd9774e0b292f9251b7d2539e4cc33fd4e 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20231210
+20231211
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0194b49162572191168096d43ebc2c0bd9e3c1f3..9903912136b6faec0a888fb50fc3029791cb8170 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,16 @@
+2023-12-10  Harald Anlauf  <anlauf@gmx.de>
+
+	Backported from master:
+	2023-12-02  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/93762
+	PR fortran/100651
+	* trans-array.cc (gfc_trans_deferred_array): Add presence check
+	for optional deferred-length character dummy arguments.
+	* trans-expr.cc (gfc_conv_missing_dummy): The character length for
+	deferred-length dummy arguments is passed by reference, so that
+	its value can be returned.  Adjust handling for optional dummies.
+
 2023-11-30  Harald Anlauf  <anlauf@gmx.de>
 
 	Backported from master:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a8a98e610a5795da85b2ac4d6086d88e41d3a542..a7bf9953f05f20da6dc7b8f3fecdf0594c0e5bd1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2023-12-10  Harald Anlauf  <anlauf@gmx.de>
+
+	Backported from master:
+	2023-12-02  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/93762
+	PR fortran/100651
+	* gfortran.dg/optional_deferred_char_1.f90: New test.
+
 2023-12-07  Marek Polacek  <polacek@redhat.com>
 
 	Backported from master: