diff --git a/config/ChangeLog b/config/ChangeLog
index 2e3ead0a26b..90e1af4779d 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-15  Alexandre Oliva <aoliva@redhat.com>
+
+	* bootstrap-debug-lean.mk (do-compare): Use the
+	contrib/compare-debug script.
+
 2017-10-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* bootstrap-cet.mk: New file.
diff --git a/config/bootstrap-debug-lean.mk b/config/bootstrap-debug-lean.mk
index e215280b09f..5f2db80687f 100644
--- a/config/bootstrap-debug-lean.mk
+++ b/config/bootstrap-debug-lean.mk
@@ -9,3 +9,4 @@
 
 STAGE2_CFLAGS += -fcompare-debug=
 STAGE3_CFLAGS += -fcompare-debug
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22431e52f45..70ae417b366 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-15  Alexandre Oliva <aoliva@redhat.com>
+
+	* dwarf2out.c (gen_producer_string): Discard
+	OPT_fcompare_debug.
+
 2017-11-15  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/81156
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 1c08a2b4e18..76a538f1ff9 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -23408,6 +23408,7 @@ gen_producer_string (void)
       case OPT_fltrans_output_list_:
       case OPT_fresolution_:
       case OPT_fdebug_prefix_map_:
+      case OPT_fcompare_debug:
 	/* Ignore these.  */
 	continue;
       default: