Index: build/old/sha1sum.pl
===================================================================
--- build/old/sha1sum.pl	(revision 1880827)
+++ build/old/sha1sum.pl	(working copy)
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 BEGIN {
-  eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
-  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
+  eval { require Digest::SHA; Digest::SHA->import(qw(sha1_hex)); 1 }
+  or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1_hex)) }
 }
 
 $/=undef;
Index: build/sha256sum.pl
===================================================================
--- build/sha256sum.pl	(revision 1880827)
+++ build/sha256sum.pl	(working copy)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 BEGIN {
-  require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+  require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex));
 }
 
 $/=undef;
Index: build/sha512sum.pl
===================================================================
--- build/sha512sum.pl	(revision 1880827)
+++ build/sha512sum.pl	(working copy)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 BEGIN {
-  require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+  require Digest::SHA; Digest::SHA->import(qw(sha256_hex sha512_hex));
 }
 
 $/=undef;
Index: lib/Mail/SpamAssassin/ArchiveIterator.pm
===================================================================
--- lib/Mail/SpamAssassin/ArchiveIterator.pm	(revision 1880827)
+++ lib/Mail/SpamAssassin/ArchiveIterator.pm	(working copy)
@@ -43,7 +43,7 @@
 
 =head1 SYNOPSIS
 
-  my $iter = new Mail::SpamAssassin::ArchiveIterator(
+  my $iter = Mail::SpamAssassin::ArchiveIterator->new(
     { 
       'opt_max_size' => 256 * 1024,  # 0 implies no limit
       'opt_cache' => 1,
@@ -77,7 +77,7 @@
 
 ###########################################################################
 
-=item $item = new Mail::SpamAssassin::ArchiveIterator( [ { opt => val, ... } ] )
+=item $item = Mail::SpamAssassin::ArchiveIterator->new( [ { opt => val, ... } ] )
 
 Constructs a new C<Mail::SpamAssassin::ArchiveIterator> object.  You may
 pass the following attribute-value pairs to the constructor.  The pairs are
Index: lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
===================================================================
--- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	(revision 1880827)
+++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	(working copy)
@@ -51,7 +51,7 @@
 
 # We need this so we can import the pg_types, since this is a DBD::Pg specific module it should be ok
 # YUCK! This little require/import trick is required for the rpm stuff
-BEGIN { require DBD::Pg; import DBD::Pg qw(:pg_types); }
+BEGIN { require DBD::Pg; DBD::Pg->import(qw(:pg_types)); }
 
 =head1 METHODS
 
Index: lib/Mail/SpamAssassin/PerMsgLearner.pm
===================================================================
--- lib/Mail/SpamAssassin/PerMsgLearner.pm	(revision 1880827)
+++ lib/Mail/SpamAssassin/PerMsgLearner.pm	(working copy)
@@ -21,7 +21,7 @@
 
 =head1 SYNOPSIS
 
-  my $spamtest = new Mail::SpamAssassin ({
+  my $spamtest = Mail::SpamAssassin->new({
     'rules_filename'      => '/etc/spamassassin.rules',
     'userprefs_filename'  => $ENV{HOME}.'/.spamassassin/user_prefs'
   });
Index: lib/Mail/SpamAssassin/PerMsgStatus.pm
===================================================================
--- lib/Mail/SpamAssassin/PerMsgStatus.pm	(revision 1880827)
+++ lib/Mail/SpamAssassin/PerMsgStatus.pm	(working copy)
@@ -21,7 +21,7 @@
 
 =head1 SYNOPSIS
 
-  my $spamtest = new Mail::SpamAssassin ({
+  my $spamtest = Mail::SpamAssassin->new({
     'rules_filename'      => '/etc/spamassassin.rules',
     'userprefs_filename'  => $ENV{HOME}.'/.spamassassin/user_prefs'
   });
Index: masses/corpora/mass-find-nonspam
===================================================================
--- masses/corpora/mass-find-nonspam	(revision 1880827)
+++ masses/corpora/mass-find-nonspam	(working copy)
@@ -113,7 +113,7 @@
 use Getopt::Long;
 GetOptions("single");
 
-my $iter = new Mail::SpamAssassin::ArchiveIterator ({
+my $iter = Mail::SpamAssassin::ArchiveIterator->new({
         'opt_j' => 1,
         'opt_n' => 1,
         'opt_all' => 1,
Index: masses/mass-check
===================================================================
--- masses/mass-check	(revision 1880827)
+++ masses/mass-check	(working copy)
@@ -315,7 +315,7 @@
 my $user_prefs = "$opt_p/user_prefs";
 
 sub create_spamtest {
-  return new Mail::SpamAssassin ({
+  return Mail::SpamAssassin->new({
     'debug'              		=> $opt_debug,
     'rules_filename'     		=> $opt_c,
     'site_rules_filename'		=> "$opt_p/local.cf",
@@ -407,7 +407,7 @@
 ###########################################################################
 ## SCAN MODE
 
-my $iter = new Mail::SpamAssassin::ArchiveIterator($AIopts);
+my $iter = Mail::SpamAssassin::ArchiveIterator->new($AIopts);
 
 # setup the AI functions
 if ($opt_client) {
Index: spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
===================================================================
--- spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	(revision 1880827)
+++ spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	(working copy)
@@ -255,7 +255,7 @@
     if (exists $self->{'ident-timeout'} && $self->{'ident-timeout'} <= 0) {
       die "ERROR: --ident-timeout must be > 0\n";
     }
-    ##import Net::Ident qw(ident_lookup);
+    ##Net::Ident->import(qw(ident_lookup));
   }
 
   # let's not modify %ENV here...
Index: t/rule_names.t
===================================================================
--- t/rule_names.t	(revision 1880827)
+++ t/rule_names.t	(working copy)
@@ -22,8 +22,8 @@
 use Mail::SpamAssassin;
 
 BEGIN {
-  eval { require Digest::SHA; import Digest::SHA qw(sha1); 1 }
-  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
+  eval { require Digest::SHA; Digest::SHA->import(qw(sha1)); 1 }
+  or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1)) }
 }
 
 our $RUN_THIS_TEST;
Index: t/trust_path.t
===================================================================
--- t/trust_path.t	(revision 1880827)
+++ t/trust_path.t	(working copy)
@@ -15,7 +15,7 @@
 eval {
   require Net::Patricia;
   Net::Patricia->VERSION(1.16);  # need AF_INET6 support
-  import Net::Patricia;
+  Net::Patricia->import;
   $have_patricia = 1;
 };
 
Index: t.rules/run
===================================================================
--- t.rules/run	(revision 1880827)
+++ t.rules/run	(working copy)
@@ -147,7 +147,7 @@
 
 sub create_spamtest {
   $spamtest->finish() if $spamtest;
-  $spamtest = new Mail::SpamAssassin(
+  $spamtest = Mail::SpamAssassin->new(
     {
       rules_filename      => 'rules',
       site_rules_filename => 'rules/local.cf',
Index: tools/split_corpora
===================================================================
--- tools/split_corpora	(revision 1880827)
+++ tools/split_corpora	(working copy)
@@ -43,7 +43,7 @@
 
 my @bucket_fhs = ();
 foreach my $bucket (1 .. $num_buckets) {
-  my $bucket_fh = new FileHandle();
+  my $bucket_fh = FileHandle->new();
 
   if (!$bucket_fh->open(">$prefix.$bucket")) {
     die "Could not open '$prefix.$bucket' for writing: $!\n";
@@ -54,7 +54,7 @@
 
 my $current_bucket = 0;
 
-my $iter = new Mail::SpamAssassin::ArchiveIterator({
+my $iter = Mail::SpamAssassin::ArchiveIterator->new({
         'opt_all' => 1,
   });