1 files changed, 4 insertions, 5 deletions

diff --git a/whine.pl b/whine.pl
index a13a129b4..0642ec5ab 100755
--- a/whine.pl
+++ b/whine.pl
@@ -99,14 +99,13 @@ if (Param('shutdownhtml')) {
 }
 
 
-# Send whines from the maintainer address. It's not a good idea to use
-# the whine creator address because the admin can make more use of bounces and
-# other replies.
-my $fromaddress = Param('maintainer');
+# Send whines from the address in the 'mailfrom' Parameter so that all
+# Bugzilla-originated mail appears to come from a single address.
+my $fromaddress = Param('mailfrom');
 
 if ($fromaddress !~ Param('emailregexp')) {
     die "Cannot run.  " .
-        "The maintainer email address has not been properly set!\n";
+        "The Bugzilla email address has not been properly set!\n";
 }
 
 # Check the nomail file for users who should not receive mail