diff --git a/NEWS b/NEWS
index 85bdec447b0..46db91b9908 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
   . Fixed bug #76088 (ODBC functions are not available by default on Windows).
     (cmb)
 
+- Standard:
+  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
 
 29 Mar 2018, PHP 7.2.4
 
diff --git a/php.ini-development b/php.ini-development
index 72ab5753b80..57500369aab 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1042,7 +1042,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
diff --git a/php.ini-production b/php.ini-production
index 491e92fa576..9733ec4d29d 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1049,7 +1049,7 @@ smtp_port = 25
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = On
+mail.add_x_header = Off
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.