diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0e06a092ef6..0ae93fd322e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-26  Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/invoke.texi (-Wreturn-type): Document default status for C++.
+
 2018-04-26  Tom de Vries  <tom@codesourcery.com>
 
 	PR target/84952
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 9c7fe187f483..444159178a76 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -4783,7 +4783,7 @@ For C++, a function without return type always produces a diagnostic
 message, even when @option{-Wno-return-type} is specified.  The only
 exceptions are @code{main} and functions defined in system headers.
 
-This warning is enabled by @option{-Wall}.
+This warning is enabled by default for C++ and is enabled by @option{-Wall}.
 
 @item -Wshift-count-negative
 @opindex Wshift-count-negative