diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9c13ff060c3..25c3f169fcd 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/85111
+	* array.c (gfc_resolve_character_array_constructor): Early
+	exit for zero-size arrays.
+	* simplify.c (simplify_transformation_to_array): Exit early
+	if the result size is zero.
+	(simplify_minmaxloc_to_array): Likewise.
+
 2018-03-28  Mikael Morin  <mikael@gcc.gnu.org>
 
 	PR fortran/69497
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a8906ddbc98..0bbefba5e21 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/85111
+	* gfortran.dg/zero_sized_10.f90: New test.
+
 2018-03-29  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c++/84269