diff --git a/config/ChangeLog b/config/ChangeLog
index d978f41f4be..aa63efdc0ec 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR bootstrap/85490
+	* bootstrap-cet.mk (STAGE4_CFLAGS): New.
+
 2018-04-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/85485
diff --git a/config/bootstrap-cet.mk b/config/bootstrap-cet.mk
index b5dee601a3f..6ef1ba279cd 100644
--- a/config/bootstrap-cet.mk
+++ b/config/bootstrap-cet.mk
@@ -1,4 +1,5 @@
-# This option enables -fcf-protection for stage2 and stage3.
+# This option enables -fcf-protection for stage2, stage3 and stage4.
 
 STAGE2_CFLAGS += -fcf-protection
 STAGE3_CFLAGS += -fcf-protection
+STAGE4_CFLAGS += -fcf-protection