diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bc6dd0b9645780ddc80581d6ac327f2b7699a541..81182dfe29fe0c4950d76ab5290aa34381d8e66b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	PR fortran/36031
+	* decl.c (set_enum_kind): Use global short-enums flag.
+	* gfortran.h (gfc_option_t): Remove short_enums flag.
+	* lang.opt (-fshort-enums): Refer to C documentation.
+	* options.c (gfc_init_options, gfc_handle_option): Use global
+	short-enums flag.
+
 2009-05-15  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/39352