diff --git a/bin/mail b/bin/mail
index 9be23072..81def111 100755
--- a/bin/mail
+++ b/bin/mail
@@ -41,7 +41,7 @@ package
 @ISA=qw(PerlPowerTools::mailprog);
 
 use IO::Socket;
-use Sys::Hostname;   # Claims to be standard?
+use Sys::Hostname qw();
 
 %mailer::fields=(
 	  user => undef,
@@ -83,7 +83,7 @@ sub new {
 		}
 		# Find my address...
 		if (! defined $ENV{HOSTNAME}) {
-			my $hostname=hostname();
+			my $hostname = Sys::Hostname::hostname();
 			if (! $hostname) {
 				die "Unable to find a reasonable hostname.  Use \$HOSTNAME.\n";
 			}