diff --git a/config/ChangeLog b/config/ChangeLog
index 63f4325314f2d9467bdf2da019ec42a44136126d..5a06cdeea818b57b36f7d40b26e3f33e9dd7ae86 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-08  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* bootstrap-Og.mk: New file.
+
 2019-06-25  Kwok Cheung Yeung  <kcy@codesourcery.com>
             Andrew Stubbs  <ams@codesourcery.com>
 
diff --git a/config/bootstrap-Og.mk b/config/bootstrap-Og.mk
new file mode 100644
index 0000000000000000000000000000000000000000..9057afbe354d8a3e29af8bf2fd7294ea4504d81d
--- /dev/null
+++ b/config/bootstrap-Og.mk
@@ -0,0 +1 @@
+BOOT_CFLAGS := -Og $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96ae53aa8b03575a0ccab36b7f44216365d0f08e..145b7b206c688fa03d687ef2bff0d454bb4323cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-08  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* doc/install.texi (bootstrap-Og): Document.
+
 2019-07-08  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/riscv/pic.md (*local_pic_load_s<mode>)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 852aa8f6dae25c95b561d09f81000bba1c6a676d..2598713c1989b366d533e72b6588e17ba6d549af 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -2535,6 +2535,7 @@ Removes any @option{-O}-started option from @code{BOOT_CFLAGS}, and adds
 @samp{BOOT_CFLAGS='-g -O1'}.
 
 @item @samp{bootstrap-O3}
+@itemx @samp{bootstrap-Og}
 Analogous to @code{bootstrap-O1}.
 
 @item @samp{bootstrap-lto}