diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 162d027ce73b..a34c4eec137a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-13  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* sem.adb (Do_Analyze): Recompute Style_Check_Max_Line_Length
+	after restoring Style_Max_Line_Length.
+
 2019-08-13  Arnaud Charlet  <charlet@adacore.com>
 
 	* sem_ch13.adb (Check_Iterator_Functions): Protect against
diff --git a/gcc/ada/sem.adb b/gcc/ada/sem.adb
index 2f8f6a4eee49..9b6b33535f97 100644
--- a/gcc/ada/sem.adb
+++ b/gcc/ada/sem.adb
@@ -1395,6 +1395,7 @@ package body Sem is
          Restore_Scope_Stack  (List);
          Restore_Ghost_Region (Saved_GM, Saved_IGR);
          Style_Max_Line_Length := Saved_ML;
+         Style_Check_Max_Line_Length := Style_Max_Line_Length /= 0;
       end Do_Analyze;
 
       --  Local variables