diff --git a/bin/pt-agent b/bin/pt-agent
index 86e56b7b..b77afb03 100755
--- a/bin/pt-agent
+++ b/bin/pt-agent
@@ -15,14 +15,12 @@ BEGIN {
    $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
       Percona::Toolkit
       VersionCheck
-      Pingback
       DSNParser
       OptionParser
       Cxn
       Quoter
       VersionParser
       Daemon
-      Retry
       Transformers
    ));
 }
@@ -377,369 +375,6 @@ sub _d {
 # End VersionCheck package
 # ###########################################################################
 
-# ###########################################################################
-# Pingback package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
-#   lib/Pingback.pm
-#   t/lib/Pingback.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-package Pingback;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper   qw();
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
-use Fcntl          qw(:DEFAULT);
-use File::Basename qw();
-use File::Spec;
-
-my $dir              = File::Spec->tmpdir();
-my $check_time_file  = File::Spec->catfile($dir,'percona-toolkit-version-check');
-my $check_time_limit = 60 * 60 * 24;  # one day
-
-sub Dumper {
-   local $Data::Dumper::Indent    = 1;
-   local $Data::Dumper::Sortkeys  = 1;
-   local $Data::Dumper::Quotekeys = 0;
-
-   Data::Dumper::Dumper(@_);
-}
-
-local $EVAL_ERROR;
-eval {
-   require Percona::Toolkit;
-   require HTTPMicro;
-   require VersionCheck;
-};
-
-sub version_check {
-   my %args      = @_;
-   my @instances = $args{instances} ? @{ $args{instances} } : ();
-
-   if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-      warn '--version-check is disabled by the PERCONA_VERSION_CHECK ',
-                   "environment variable.\n\n";
-      return;
-   }
-
-   $args{protocol} ||= 'https';
-   my @protocols = $args{protocol} eq 'auto'
-                 ? qw(https http)
-                 : $args{protocol};
-   
-   my $instances_to_check = [];
-   my $time               = int(time());
-   eval {
-      foreach my $instance ( @instances ) {
-         my ($name, $id) = _generate_identifier($instance);
-         $instance->{name} = $name;
-         $instance->{id}   = $id;
-      }
-
-      my $time_to_check;
-      ($time_to_check, $instances_to_check)
-         = time_to_check($check_time_file, \@instances, $time);
-      if ( !$time_to_check ) {
-         warn 'It is not time to --version-check again; ',
-                      "only 1 check per day.\n\n";
-         return;
-      }
-
-      my $advice;
-      my $e;
-      for my $protocol ( @protocols ) {
-         $advice = eval { pingback(
-            url       => $ENV{PERCONA_VERSION_CHECK_URL} || "$protocol://v.percona.com",
-            instances => $instances_to_check,
-            protocol  => $protocol,
-         ) };
-         last if !$advice && !$EVAL_ERROR;
-         $e ||= $EVAL_ERROR;
-      }
-      if ( $advice ) {
-         print "# Percona suggests these upgrades:\n";
-         print join("\n", map { "#   * $_" } @$advice), "\n\n";
-      }
-      else {
-         die $e if $e;
-         print "# No suggestions at this time.\n\n";
-         ($ENV{PTVCDEBUG} || PTDEBUG )
-            && _d('--version-check worked, but there were no suggestions');
-      }
-   };
-   if ( $EVAL_ERROR ) {
-      warn "Error doing --version-check: $EVAL_ERROR";
-   }
-   else {
-      update_checks_file($check_time_file, $instances_to_check, $time);
-   }
-   
-   return;
-}
-
-sub pingback {
-   my (%args) = @_;
-   my @required_args = qw(url);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($url) = @args{@required_args};
-
-   my ($instances, $ua, $vc) = @args{qw(instances ua VersionCheck)};
-
-   $ua ||= HTTPMicro->new( timeout => 5 );
-   $vc ||= VersionCheck->new();
-
-   my $response = $ua->request('GET', $url);
-   ($ENV{PTVCDEBUG} || PTDEBUG) && _d('Server response:', Dumper($response));
-   die "No response from GET $url"
-      if !$response;
-   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
-       ($response->{content} || '')) if $response->{status} != 200;
-   die("GET on $url did not return any programs to check")
-      if !$response->{content};
-
-   my $items = $vc->parse_server_response(
-      response => $response->{content}
-   );
-   die "Failed to parse server requested programs: $response->{content}"
-      if !scalar keys %$items;
-      
-   my $versions = $vc->get_versions(
-      items     => $items,
-      instances => $instances,
-   );
-   die "Failed to get any program versions; should have at least gotten Perl"
-      if !scalar keys %$versions;
-
-   my $client_content = encode_client_response(
-      items      => $items,
-      versions   => $versions,
-      general_id => md5_hex( hostname() ),
-   );
-
-   my $client_response = {
-      headers => { "X-Percona-Toolkit-Tool" => File::Basename::basename($0) },
-      content => $client_content,
-   };
-   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-      _d('Client response:', Dumper($client_response));
-   }
-
-   $response = $ua->request('POST', $url, $client_response);
-   PTDEBUG && _d('Server suggestions:', Dumper($response));
-   die "No response from POST $url $client_response"
-      if !$response;
-   die "POST $url returned HTTP status $response->{status}; expected 200"
-      if $response->{status} != 200;
-
-   return unless $response->{content};
-
-   $items = $vc->parse_server_response(
-      response   => $response->{content},
-      split_vars => 0,
-   );
-   die "Failed to parse server suggestions: $response->{content}"
-      if !scalar keys %$items;
-   my @suggestions = map { $_->{vars} }
-                     sort { $a->{item} cmp $b->{item} }
-                     values %$items;
-
-   return \@suggestions;
-}
-
-sub time_to_check {
-   my ($file, $instances, $time) = @_;
-   die "I need a file argument" unless $file;
-   $time ||= int(time());  # current time
-
-   if ( @$instances ) {
-      my $instances_to_check = instances_to_check($file, $instances, $time);
-      return scalar @$instances_to_check, $instances_to_check;
-   }
-
-   return 1 if !-f $file;
-   
-   my $mtime  = (stat $file)[9];
-   if ( !defined $mtime ) {
-      PTDEBUG && _d('Error getting modified time of', $file);
-      return 1;
-   }
-   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
-   if ( ($time - $mtime) > $check_time_limit ) {
-      return 1;
-   }
-
-   return 0;
-}
-
-sub instances_to_check {
-   my ($file, $instances, $time, %args) = @_;
-
-   my $file_contents = '';
-   if (open my $fh, '<', $file) {
-      chomp($file_contents = do { local $/ = undef; <$fh> });
-      close $fh;
-   }
-   my %cached_instances = $file_contents =~ /^([^,]+),(.+)$/mg;
-
-   my @instances_to_check;
-   foreach my $instance ( @$instances ) {
-      my $mtime = $cached_instances{ $instance->{id} };
-      if ( !$mtime || (($time - $mtime) > $check_time_limit) ) {
-         if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-            _d('Time to check MySQL instance', $instance->{name});
-         }
-         push @instances_to_check, $instance;
-         $cached_instances{ $instance->{id} } = $time;
-      }
-   }
-
-   if ( $args{update_file} ) {
-      open my $fh, '>', $file or die "Cannot open $file for writing: $OS_ERROR";
-      while ( my ($id, $time) = each %cached_instances ) {
-         print { $fh } "$id,$time\n";
-      }
-      close $fh or die "Cannot close $file: $OS_ERROR";
-   }
-
-   return \@instances_to_check;
-}
-
-sub update_checks_file {
-   my ($file, $instances, $time) = @_;
-
-   if ( !-f $file ) {
-      if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('Creating time limit file', $file);
-      }
-      _touch($file);
-   }
-
-   if ( $instances && @$instances ) {
-      instances_to_check($file, $instances, $time, update_file => 1);
-      return;
-   }
-
-   my $mtime  = (stat $file)[9];
-   if ( !defined $mtime ) {
-      _touch($file);
-      return;
-   }
-   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
-   if ( ($time - $mtime) > $check_time_limit ) {
-      _touch($file);
-      return;
-   }
-
-   return;
-}
-
-sub _touch {
-   my ($file) = @_;
-   sysopen my $fh, $file, O_WRONLY|O_CREAT
-      or die "Cannot create $file : $!";
-   close $fh or die "Cannot close $file : $!";
-   utime(undef, undef, $file);
-}
-
-sub _generate_identifier {
-   my $instance = shift;
-   my $dbh      = $instance->{dbh};
-   my $dsn      = $instance->{dsn};
-
-   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
-   PTDEBUG && _d($sql);
-   my ($name) = eval { $dbh->selectrow_array($sql) };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d($EVAL_ERROR);
-      $sql = q{SELECT @@hostname};
-      PTDEBUG && _d($sql);
-      ($name) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d($EVAL_ERROR);
-         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
-      }
-      else {
-         $sql = q{SHOW VARIABLES LIKE 'port'};
-         PTDEBUG && _d($sql);
-         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
-         PTDEBUG && _d('port:', $port);
-         $name .= $port || '';
-      }
-   }
-   my $id = md5_hex($name);
-
-   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-      _d('MySQL instance', $name, 'is', $id);
-   }
-
-   return $name, $id;
-}
-
-sub encode_client_response {
-   my (%args) = @_;
-   my @required_args = qw(items versions general_id);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($items, $versions, $general_id) = @args{@required_args};
-
-   my @lines;
-   foreach my $item ( sort keys %$items ) {
-      next unless exists $versions->{$item};
-      if ( ref($versions->{$item}) eq 'HASH' ) {
-         my $mysql_versions = $versions->{$item};
-         for my $id ( sort keys %$mysql_versions ) {
-            push @lines, join(';', $id, $item, $mysql_versions->{$id});
-         }
-      }
-      else {
-         push @lines, join(';', $general_id, $item, $versions->{$item});
-      }
-   }
-
-   my $client_response = join("\n", @lines) . "\n";
-   return $client_response;
-}
-
-sub validate_options {
-   my ($o) = @_;
-
-   return if !$o->got('version-check');
-
-   my $value  = $o->get('version-check');
-   my @values = split /, /,
-                $o->read_para_after(__FILE__, qr/MAGIC_version_check/);
-   chomp(@values);
-                
-   return if grep { $value eq $_ } @values;
-   $o->save_error("--version-check invalid value $value.  Accepted values are "
-                . join(", ", @values[0..$#values-1]) . " and $values[-1]" );
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Pingback package
-# ###########################################################################
-
 # ###########################################################################
 # DSNParser package
 # This package is a copy without comments from the original.  The original
@@ -2810,84 +2445,6 @@ sub _d {
 # End Daemon package
 # ###########################################################################
 
-# ###########################################################################
-# Retry package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
-#   lib/Retry.pm
-#   t/lib/Retry.t
-# See https://launchpad.net/percona-toolkit for more information.
-# ###########################################################################
-{
-package Retry;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub new {
-   my ( $class, %args ) = @_;
-   my $self = {
-      %args,
-   };
-   return bless $self, $class;
-}
-
-sub retry {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(try fail final_fail);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my ($try, $fail, $final_fail) = @args{@required_args};
-   my $wait  = $args{wait}  || sub { sleep 1; };
-   my $tries = $args{tries} || 3;
-
-   my $last_error;
-   my $tryno = 0;
-   TRY:
-   while ( ++$tryno <= $tries ) {
-      PTDEBUG && _d("Try", $tryno, "of", $tries);
-      my $result;
-      eval {
-         $result = $try->(tryno=>$tryno);
-      };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d("Try code failed:", $EVAL_ERROR);
-         $last_error = $EVAL_ERROR;
-
-         if ( $tryno < $tries ) {   # more retries
-            my $retry = $fail->(tryno=>$tryno, error=>$last_error);
-            last TRY unless $retry;
-            PTDEBUG && _d("Calling wait code");
-            $wait->(tryno=>$tryno);
-         }
-      }
-      else {
-         PTDEBUG && _d("Try code succeeded");
-         return $result;
-      }
-   }
-
-   PTDEBUG && _d('Try code did not succeed');
-   return $final_fail->(error=>$last_error);
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Retry package
-# ###########################################################################
-
 # ###########################################################################
 # Transformers package
 # This package is a copy without comments from the original.  The original
@@ -3258,10 +2815,6 @@ use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(signal_h);
 use Time::HiRes qw(sleep time);
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
 
 use sigtrap 'handler', \&sig_int, 'normal-signals';
 
diff --git a/lib/Percona/HTTP/Mirco.pm b/lib/HTTP/Mirco.pm
similarity index 100%
rename from lib/Percona/HTTP/Mirco.pm
rename to lib/HTTP/Mirco.pm
diff --git a/lib/Pingback.pm b/lib/Pingback.pm
deleted file mode 100644
index 84a4803f..00000000
--- a/lib/Pingback.pm
+++ /dev/null
@@ -1,439 +0,0 @@
-# This program is copyright 2012 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# VersionCheck package
-# ###########################################################################
-{
-# Package: Pingback
-# Pingback gets and reports program versions to Percona.
-package Pingback;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper   qw();
-use Digest::MD5    qw(md5_hex);
-use Sys::Hostname  qw(hostname);
-use Fcntl          qw(:DEFAULT);
-use File::Basename qw();
-use File::Spec;
-
-my $dir              = File::Spec->tmpdir();
-my $check_time_file  = File::Spec->catfile($dir,'percona-toolkit-version-check');
-my $check_time_limit = 60 * 60 * 24;  # one day
-
-sub Dumper {
-   local $Data::Dumper::Indent    = 1;
-   local $Data::Dumper::Sortkeys  = 1;
-   local $Data::Dumper::Quotekeys = 0;
-
-   Data::Dumper::Dumper(@_);
-}
-
-local $EVAL_ERROR;
-eval {
-   require Percona::Toolkit;
-   require HTTPMicro;
-   require VersionCheck;
-};
-
-sub version_check {
-   my %args      = @_;
-   my @instances = $args{instances} ? @{ $args{instances} } : ();
-   # If this blows up, oh well, don't bother the user about it.
-   # This feature is a "best effort" only; we don't want it to
-   # get in the way of the tool's real work.
-
-   if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
-      warn '--version-check is disabled by the PERCONA_VERSION_CHECK ',
-                   "environment variable.\n\n";
-      return;
-   }
-
-   # we got here if the protocol wasn't "off", and the values
-   # were validated earlier, so just handle auto
-   # This line is mostly here for the test suite:
-   $args{protocol} ||= 'https';
-   my @protocols = $args{protocol} eq 'auto'
-                 ? qw(https http)
-                 : $args{protocol};
-   
-   my $instances_to_check = [];
-   my $time               = int(time());
-   eval {
-      # Name and ID the instances.  The name is for debugging; the ID is
-      # what the code uses.
-      foreach my $instance ( @instances ) {
-         my ($name, $id) = _generate_identifier($instance);
-         $instance->{name} = $name;
-         $instance->{id}   = $id;
-      }
-
-      my $time_to_check;
-      ($time_to_check, $instances_to_check)
-         = time_to_check($check_time_file, \@instances, $time);
-      if ( !$time_to_check ) {
-         warn 'It is not time to --version-check again; ',
-                      "only 1 check per day.\n\n";
-         return;
-      }
-
-      my $advice;
-      my $e;
-      for my $protocol ( @protocols ) {
-         $advice = eval { pingback(
-            url       => $ENV{PERCONA_VERSION_CHECK_URL} || "$protocol://v.percona.com",
-            instances => $instances_to_check,
-            protocol  => $protocol,
-         ) };
-         # No advice, and no error, so no reason to keep trying.
-         last if !$advice && !$EVAL_ERROR;
-         $e ||= $EVAL_ERROR;
-      }
-      if ( $advice ) {
-         print "# Percona suggests these upgrades:\n";
-         print join("\n", map { "#   * $_" } @$advice), "\n\n";
-      }
-      else {
-         die $e if $e;
-         print "# No suggestions at this time.\n\n";
-         ($ENV{PTVCDEBUG} || PTDEBUG )
-            && _d('--version-check worked, but there were no suggestions');
-      }
-   };
-   if ( $EVAL_ERROR ) {
-      warn "Error doing --version-check: $EVAL_ERROR";
-   }
-   else {
-      update_checks_file($check_time_file, $instances_to_check, $time);
-   }
-   
-   return;
-}
-
-sub pingback {
-   my (%args) = @_;
-   my @required_args = qw(url);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($url) = @args{@required_args};
-
-   # Optional args
-   my ($instances, $ua, $vc) = @args{qw(instances ua VersionCheck)};
-
-   $ua ||= HTTPMicro->new( timeout => 5 );
-   $vc ||= VersionCheck->new();
-
-   # GET https://upgrade.percona.com, the server will return
-   # a plaintext list of items/programs it wants the tool
-   # to get, one item per line with the format ITEM;TYPE[;VARS]
-   # ITEM is the pretty name of the item/program; TYPE is
-   # the type of ITEM that helps the tool determine how to
-   # get the item's version; and VARS is optional for certain
-   # items/types that need extra hints.
-   my $response = $ua->request('GET', $url);
-   ($ENV{PTVCDEBUG} || PTDEBUG) && _d('Server response:', Dumper($response));
-   die "No response from GET $url"
-      if !$response;
-   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
-       ($response->{content} || '')) if $response->{status} != 200;
-   die("GET on $url did not return any programs to check")
-      if !$response->{content};
-
-   # Parse the plaintext server response into a hashref keyed on
-   # the items like:
-   #    "MySQL" => {
-   #      item => "MySQL",
-   #      type => "mysql_variables",
-   #      vars => ["version", "version_comment"],
-   #    }
-   my $items = $vc->parse_server_response(
-      response => $response->{content}
-   );
-   die "Failed to parse server requested programs: $response->{content}"
-      if !scalar keys %$items;
-      
-   # Get the versions for those items in another hashref also keyed on
-   # the items like:
-   #    "MySQL" => "MySQL Community Server 5.1.49-log",
-   my $versions = $vc->get_versions(
-      items     => $items,
-      instances => $instances,
-   );
-   die "Failed to get any program versions; should have at least gotten Perl"
-      if !scalar keys %$versions;
-
-   # Join the items and whatever versions are available and re-encode
-   # them in same simple plaintext item-per-line protocol, and send
-   # it back to Percona.
-   my $client_content = encode_client_response(
-      items      => $items,
-      versions   => $versions,
-      general_id => md5_hex( hostname() ),
-   );
-
-   my $client_response = {
-      headers => { "X-Percona-Toolkit-Tool" => File::Basename::basename($0) },
-      content => $client_content,
-   };
-   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-      _d('Client response:', Dumper($client_response));
-   }
-
-   $response = $ua->request('POST', $url, $client_response);
-   PTDEBUG && _d('Server suggestions:', Dumper($response));
-   die "No response from POST $url $client_response"
-      if !$response;
-   die "POST $url returned HTTP status $response->{status}; expected 200"
-      if $response->{status} != 200;
-
-   # If the server does not have any suggestions,
-   # there will not be any content.
-   return unless $response->{content};
-
-   # If the server has suggestions for items, it sends them back in
-   # the same format: ITEM:TYPE:SUGGESTION\n.  ITEM:TYPE is mostly for
-   # debugging; the tool just repports the suggestions.
-   $items = $vc->parse_server_response(
-      response   => $response->{content},
-      split_vars => 0,
-   );
-   die "Failed to parse server suggestions: $response->{content}"
-      if !scalar keys %$items;
-   my @suggestions = map { $_->{vars} }
-                     sort { $a->{item} cmp $b->{item} }
-                     values %$items;
-
-   return \@suggestions;
-}
-
-sub time_to_check {
-   my ($file, $instances, $time) = @_;
-   die "I need a file argument" unless $file;
-   $time ||= int(time());  # current time
-
-   # If we have MySQL instances, check only the ones that haven't been
-   # seen/checked before or were check > 24 hours ago.
-   if ( @$instances ) {
-      my $instances_to_check = instances_to_check($file, $instances, $time);
-      return scalar @$instances_to_check, $instances_to_check;
-   }
-
-   return 1 if !-f $file;
-   
-   # No MySQL instances (happens with tools like pt-diskstats), so just
-   # check the file's mtime and check if it was updated > 24 hours ago.
-   my $mtime  = (stat $file)[9];
-   if ( !defined $mtime ) {
-      PTDEBUG && _d('Error getting modified time of', $file);
-      return 1;
-   }
-   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
-   if ( ($time - $mtime) > $check_time_limit ) {
-      return 1;
-   }
-
-   # File was updated less than a day ago; don't check yet.
-   return 0;
-}
-
-sub instances_to_check {
-   my ($file, $instances, $time, %args) = @_;
-
-   # The time limit file contains "ID,time" lines for each MySQL instance
-   # that the last tool connected to.  The last tool may have seen fewer
-   # or more MySQL instances than the current tool, but we'll read them
-   # all and check only the MySQL instances for the current tool.
-   my $file_contents = '';
-   if (open my $fh, '<', $file) {
-      chomp($file_contents = do { local $/ = undef; <$fh> });
-      close $fh;
-   }
-   my %cached_instances = $file_contents =~ /^([^,]+),(.+)$/mg;
-
-   # Check the MySQL instances that have either 1) never been checked
-   # (or seen) before, or 2) were check > 24 hours ago.
-   my @instances_to_check;
-   foreach my $instance ( @$instances ) {
-      my $mtime = $cached_instances{ $instance->{id} };
-      if ( !$mtime || (($time - $mtime) > $check_time_limit) ) {
-         if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-            _d('Time to check MySQL instance', $instance->{name});
-         }
-         push @instances_to_check, $instance;
-         $cached_instances{ $instance->{id} } = $time;
-      }
-   }
-
-   if ( $args{update_file} ) {
-      # Overwrite the time limit file with the check times for instances
-      # we're going to check or with the original check time for instances
-      # that we're still waiting on.
-      open my $fh, '>', $file or die "Cannot open $file for writing: $OS_ERROR";
-      while ( my ($id, $time) = each %cached_instances ) {
-         print { $fh } "$id,$time\n";
-      }
-      close $fh or die "Cannot close $file: $OS_ERROR";
-   }
-
-   return \@instances_to_check;
-}
-
-sub update_checks_file {
-   my ($file, $instances, $time) = @_;
-
-   # If there's no time limit file, then create it, but
-   # don't return yet, let _time_to_check_by_instances() write any MySQL
-   # instances to the file, then return.
-   if ( !-f $file ) {
-      if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-         _d('Creating time limit file', $file);
-      }
-      _touch($file);
-   }
-
-   if ( $instances && @$instances ) {
-      instances_to_check($file, $instances, $time, update_file => 1);
-      return;
-   }
-
-   my $mtime  = (stat $file)[9];
-   if ( !defined $mtime ) {
-      _touch($file);
-      return;
-   }
-   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
-   if ( ($time - $mtime) > $check_time_limit ) {
-      _touch($file);
-      return;
-   }
-
-   return;
-}
-
-sub _touch {
-   my ($file) = @_;
-   sysopen my $fh, $file, O_WRONLY|O_CREAT
-      or die "Cannot create $file : $!";
-   close $fh or die "Cannot close $file : $!";
-   utime(undef, undef, $file);
-}
-
-sub _generate_identifier {
-   my $instance = shift;
-   my $dbh      = $instance->{dbh};
-   my $dsn      = $instance->{dsn};
-
-   # MySQL 5.1+ has @@hostname and @@port
-   # MySQL 5.0  has @@hostname but port only in SHOW VARS
-   # MySQL 4.x  has nothing, so we use the dsn
-   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
-   PTDEBUG && _d($sql);
-   my ($name) = eval { $dbh->selectrow_array($sql) };
-   if ( $EVAL_ERROR ) {
-      # MySQL 4.x or 5.0
-      PTDEBUG && _d($EVAL_ERROR);
-      $sql = q{SELECT @@hostname};
-      PTDEBUG && _d($sql);
-      ($name) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         # MySQL 4.x
-         PTDEBUG && _d($EVAL_ERROR);
-         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
-      }
-      else {
-         # MySQL 5.0
-         $sql = q{SHOW VARIABLES LIKE 'port'};
-         PTDEBUG && _d($sql);
-         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
-         PTDEBUG && _d('port:', $port);
-         $name .= $port || '';
-      }
-   }
-   my $id = md5_hex($name);
-
-   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
-      _d('MySQL instance', $name, 'is', $id);
-   }
-
-   return $name, $id;
-}
-
-sub encode_client_response {
-   my (%args) = @_;
-   my @required_args = qw(items versions general_id);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg arugment" unless $args{$arg};
-   }
-   my ($items, $versions, $general_id) = @args{@required_args};
-
-   # There may not be a version for each item.  For example, the server
-   # may have requested the "MySQL" (version) item, but if the tool
-   # didn't connect to MySQL, there won't be a $versions->{MySQL}.
-   # That's ok; just use what we've got.
-   # NOTE: the sort is only need to make testing deterministic.
-   my @lines;
-   foreach my $item ( sort keys %$items ) {
-      next unless exists $versions->{$item};
-      if ( ref($versions->{$item}) eq 'HASH' ) {
-         my $mysql_versions = $versions->{$item};
-         for my $id ( sort keys %$mysql_versions ) {
-            push @lines, join(';', $id, $item, $mysql_versions->{$id});
-         }
-      }
-      else {
-         push @lines, join(';', $general_id, $item, $versions->{$item});
-      }
-   }
-
-   my $client_response = join("\n", @lines) . "\n";
-   return $client_response;
-}
-
-sub validate_options {
-   my ($o) = @_;
-
-   # No need to validate anything if we didn't get an explicit v-c
-   return if !$o->got('version-check');
-
-   my $value  = $o->get('version-check');
-   my @values = split /, /,
-                $o->read_para_after(__FILE__, qr/MAGIC_version_check/);
-   chomp(@values);
-                
-   return if grep { $value eq $_ } @values;
-   $o->save_error("--version-check invalid value $value.  Accepted values are "
-                . join(", ", @values[0..$#values-1]) . " and $values[-1]" );
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Pingback package
-# ###########################################################################
diff --git a/lib/VersionCheck.pm b/lib/VersionCheck.pm
index 95b19e15..a170921d 100644
--- a/lib/VersionCheck.pm
+++ b/lib/VersionCheck.pm
@@ -26,17 +26,41 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 
+use File::Basename qw();
+use Data::Dumper   qw();
+use Data::Dumper   qw();
+use Digest::MD5    qw(md5_hex);
+use Sys::Hostname  qw(hostname);
+use Fcntl          qw(:DEFAULT);
+use File::Basename qw();
+use File::Spec;
+
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
-use File::Basename ();
-use Data::Dumper ();
+local $EVAL_ERROR;
+eval {
+   require Percona::Toolkit;
+   require Percona::HTTP::Micro;
+};
 
-sub Dumper {
-   local $Data::Dumper::Indent    = 1;
-   local $Data::Dumper::Sortkeys  = 1;
-   local $Data::Dumper::Quotekeys = 0;
+my $dir              = File::Spec->tmpdir();
+my $check_time_file  = File::Spec->catfile($dir,'percona-toolkit-version-check');
+my $check_time_limit = 60 * 60 * 24;  # one day
 
-   Data::Dumper::Dumper(@_);
+sub validate_options {
+   my ($o) = @_;
+
+   # No need to validate anything if we didn't get an explicit v-c
+   return if !$o->got('version-check');
+
+   my $value  = $o->get('version-check');
+   my @values = split /, /,
+                $o->read_para_after(__FILE__, qr/MAGIC_version_check/);
+   chomp(@values);
+                
+   return if grep { $value eq $_ } @values;
+   $o->save_error("--version-check invalid value $value.  Accepted values are "
+                . join(", ", @values[0..$#values-1]) . " and $values[-1]" );
 }
 
 sub new {
@@ -54,6 +78,360 @@ sub new {
    return bless $self, $class;
 }
 
+sub version_check {
+   my %args      = @_;
+   my @instances = $args{instances} ? @{ $args{instances} } : ();
+   # If this blows up, oh well, don't bother the user about it.
+   # This feature is a "best effort" only; we don't want it to
+   # get in the way of the tool's real work.
+
+   if (exists $ENV{PERCONA_VERSION_CHECK} && !$ENV{PERCONA_VERSION_CHECK}) {
+      warn '--version-check is disabled by the PERCONA_VERSION_CHECK ',
+                   "environment variable.\n\n";
+      return;
+   }
+
+   # we got here if the protocol wasn't "off", and the values
+   # were validated earlier, so just handle auto
+   # This line is mostly here for the test suite:
+   $args{protocol} ||= 'https';
+   my @protocols = $args{protocol} eq 'auto'
+                 ? qw(https http)
+                 : $args{protocol};
+   
+   my $instances_to_check = [];
+   my $time               = int(time());
+   eval {
+      # Name and ID the instances.  The name is for debugging; the ID is
+      # what the code uses.
+      foreach my $instance ( @instances ) {
+         my ($name, $id) = _generate_identifier($instance);
+         $instance->{name} = $name;
+         $instance->{id}   = $id;
+      }
+
+      my $time_to_check;
+      ($time_to_check, $instances_to_check)
+         = time_to_check($check_time_file, \@instances, $time);
+      if ( !$time_to_check ) {
+         warn 'It is not time to --version-check again; ',
+                      "only 1 check per day.\n\n";
+         return;
+      }
+
+      my $advice;
+      my $e;
+      for my $protocol ( @protocols ) {
+         $advice = eval { pingback(
+            url       => $ENV{PERCONA_VERSION_CHECK_URL} || "$protocol://v.percona.com",
+            instances => $instances_to_check,
+            protocol  => $protocol,
+         ) };
+         # No advice, and no error, so no reason to keep trying.
+         last if !$advice && !$EVAL_ERROR;
+         $e ||= $EVAL_ERROR;
+      }
+      if ( $advice ) {
+         print "# Percona suggests these upgrades:\n";
+         print join("\n", map { "#   * $_" } @$advice), "\n\n";
+      }
+      else {
+         die $e if $e;
+         print "# No suggestions at this time.\n\n";
+         ($ENV{PTVCDEBUG} || PTDEBUG )
+            && _d('--version-check worked, but there were no suggestions');
+      }
+   };
+   if ( $EVAL_ERROR ) {
+      warn "Error doing --version-check: $EVAL_ERROR";
+   }
+   else {
+      update_checks_file($check_time_file, $instances_to_check, $time);
+   }
+   
+   return;
+}
+
+sub pingback {
+   my (%args) = @_;
+   my @required_args = qw(url);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($url) = @args{@required_args};
+
+   # Optional args
+   my ($instances, $ua, $vc) = @args{qw(instances ua VersionCheck)};
+
+   $ua ||= HTTPMicro->new( timeout => 5 );
+   $vc ||= VersionCheck->new();
+
+   # GET https://upgrade.percona.com, the server will return
+   # a plaintext list of items/programs it wants the tool
+   # to get, one item per line with the format ITEM;TYPE[;VARS]
+   # ITEM is the pretty name of the item/program; TYPE is
+   # the type of ITEM that helps the tool determine how to
+   # get the item's version; and VARS is optional for certain
+   # items/types that need extra hints.
+   my $response = $ua->request('GET', $url);
+   ($ENV{PTVCDEBUG} || PTDEBUG) && _d('Server response:', Dumper($response));
+   die "No response from GET $url"
+      if !$response;
+   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
+       ($response->{content} || '')) if $response->{status} != 200;
+   die("GET on $url did not return any programs to check")
+      if !$response->{content};
+
+   # Parse the plaintext server response into a hashref keyed on
+   # the items like:
+   #    "MySQL" => {
+   #      item => "MySQL",
+   #      type => "mysql_variables",
+   #      vars => ["version", "version_comment"],
+   #    }
+   my $items = $vc->parse_server_response(
+      response => $response->{content}
+   );
+   die "Failed to parse server requested programs: $response->{content}"
+      if !scalar keys %$items;
+      
+   # Get the versions for those items in another hashref also keyed on
+   # the items like:
+   #    "MySQL" => "MySQL Community Server 5.1.49-log",
+   my $versions = $vc->get_versions(
+      items     => $items,
+      instances => $instances,
+   );
+   die "Failed to get any program versions; should have at least gotten Perl"
+      if !scalar keys %$versions;
+
+   # Join the items and whatever versions are available and re-encode
+   # them in same simple plaintext item-per-line protocol, and send
+   # it back to Percona.
+   my $client_content = encode_client_response(
+      items      => $items,
+      versions   => $versions,
+      general_id => md5_hex( hostname() ),
+   );
+
+   my $client_response = {
+      headers => { "X-Percona-Toolkit-Tool" => File::Basename::basename($0) },
+      content => $client_content,
+   };
+   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
+      _d('Client response:', Dumper($client_response));
+   }
+
+   $response = $ua->request('POST', $url, $client_response);
+   PTDEBUG && _d('Server suggestions:', Dumper($response));
+   die "No response from POST $url $client_response"
+      if !$response;
+   die "POST $url returned HTTP status $response->{status}; expected 200"
+      if $response->{status} != 200;
+
+   # If the server does not have any suggestions,
+   # there will not be any content.
+   return unless $response->{content};
+
+   # If the server has suggestions for items, it sends them back in
+   # the same format: ITEM:TYPE:SUGGESTION\n.  ITEM:TYPE is mostly for
+   # debugging; the tool just repports the suggestions.
+   $items = $vc->parse_server_response(
+      response   => $response->{content},
+      split_vars => 0,
+   );
+   die "Failed to parse server suggestions: $response->{content}"
+      if !scalar keys %$items;
+   my @suggestions = map { $_->{vars} }
+                     sort { $a->{item} cmp $b->{item} }
+                     values %$items;
+
+   return \@suggestions;
+}
+
+sub time_to_check {
+   my ($file, $instances, $time) = @_;
+   die "I need a file argument" unless $file;
+   $time ||= int(time());  # current time
+
+   # If we have MySQL instances, check only the ones that haven't been
+   # seen/checked before or were check > 24 hours ago.
+   if ( @$instances ) {
+      my $instances_to_check = instances_to_check($file, $instances, $time);
+      return scalar @$instances_to_check, $instances_to_check;
+   }
+
+   return 1 if !-f $file;
+   
+   # No MySQL instances (happens with tools like pt-diskstats), so just
+   # check the file's mtime and check if it was updated > 24 hours ago.
+   my $mtime  = (stat $file)[9];
+   if ( !defined $mtime ) {
+      PTDEBUG && _d('Error getting modified time of', $file);
+      return 1;
+   }
+   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
+   if ( ($time - $mtime) > $check_time_limit ) {
+      return 1;
+   }
+
+   # File was updated less than a day ago; don't check yet.
+   return 0;
+}
+
+sub instances_to_check {
+   my ($file, $instances, $time, %args) = @_;
+
+   # The time limit file contains "ID,time" lines for each MySQL instance
+   # that the last tool connected to.  The last tool may have seen fewer
+   # or more MySQL instances than the current tool, but we'll read them
+   # all and check only the MySQL instances for the current tool.
+   my $file_contents = '';
+   if (open my $fh, '<', $file) {
+      chomp($file_contents = do { local $/ = undef; <$fh> });
+      close $fh;
+   }
+   my %cached_instances = $file_contents =~ /^([^,]+),(.+)$/mg;
+
+   # Check the MySQL instances that have either 1) never been checked
+   # (or seen) before, or 2) were check > 24 hours ago.
+   my @instances_to_check;
+   foreach my $instance ( @$instances ) {
+      my $mtime = $cached_instances{ $instance->{id} };
+      if ( !$mtime || (($time - $mtime) > $check_time_limit) ) {
+         if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
+            _d('Time to check MySQL instance', $instance->{name});
+         }
+         push @instances_to_check, $instance;
+         $cached_instances{ $instance->{id} } = $time;
+      }
+   }
+
+   if ( $args{update_file} ) {
+      # Overwrite the time limit file with the check times for instances
+      # we're going to check or with the original check time for instances
+      # that we're still waiting on.
+      open my $fh, '>', $file or die "Cannot open $file for writing: $OS_ERROR";
+      while ( my ($id, $time) = each %cached_instances ) {
+         print { $fh } "$id,$time\n";
+      }
+      close $fh or die "Cannot close $file: $OS_ERROR";
+   }
+
+   return \@instances_to_check;
+}
+
+sub update_checks_file {
+   my ($file, $instances, $time) = @_;
+
+   # If there's no time limit file, then create it, but
+   # don't return yet, let _time_to_check_by_instances() write any MySQL
+   # instances to the file, then return.
+   if ( !-f $file ) {
+      if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
+         _d('Creating time limit file', $file);
+      }
+      _touch($file);
+   }
+
+   if ( $instances && @$instances ) {
+      instances_to_check($file, $instances, $time, update_file => 1);
+      return;
+   }
+
+   my $mtime  = (stat $file)[9];
+   if ( !defined $mtime ) {
+      _touch($file);
+      return;
+   }
+   PTDEBUG && _d('time=', $time, 'mtime=', $mtime);
+   if ( ($time - $mtime) > $check_time_limit ) {
+      _touch($file);
+      return;
+   }
+
+   return;
+}
+
+sub _touch {
+   my ($file) = @_;
+   sysopen my $fh, $file, O_WRONLY|O_CREAT
+      or die "Cannot create $file : $!";
+   close $fh or die "Cannot close $file : $!";
+   utime(undef, undef, $file);
+}
+
+sub _generate_identifier {
+   my $instance = shift;
+   my $dbh      = $instance->{dbh};
+   my $dsn      = $instance->{dsn};
+
+   # MySQL 5.1+ has @@hostname and @@port
+   # MySQL 5.0  has @@hostname but port only in SHOW VARS
+   # MySQL 4.x  has nothing, so we use the dsn
+   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
+   PTDEBUG && _d($sql);
+   my ($name) = eval { $dbh->selectrow_array($sql) };
+   if ( $EVAL_ERROR ) {
+      # MySQL 4.x or 5.0
+      PTDEBUG && _d($EVAL_ERROR);
+      $sql = q{SELECT @@hostname};
+      PTDEBUG && _d($sql);
+      ($name) = eval { $dbh->selectrow_array($sql) };
+      if ( $EVAL_ERROR ) {
+         # MySQL 4.x
+         PTDEBUG && _d($EVAL_ERROR);
+         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
+      }
+      else {
+         # MySQL 5.0
+         $sql = q{SHOW VARIABLES LIKE 'port'};
+         PTDEBUG && _d($sql);
+         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
+         PTDEBUG && _d('port:', $port);
+         $name .= $port || '';
+      }
+   }
+   my $id = md5_hex($name);
+
+   if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
+      _d('MySQL instance', $name, 'is', $id);
+   }
+
+   return $name, $id;
+}
+
+sub encode_client_response {
+   my (%args) = @_;
+   my @required_args = qw(items versions general_id);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($items, $versions, $general_id) = @args{@required_args};
+
+   # There may not be a version for each item.  For example, the server
+   # may have requested the "MySQL" (version) item, but if the tool
+   # didn't connect to MySQL, there won't be a $versions->{MySQL}.
+   # That's ok; just use what we've got.
+   # NOTE: the sort is only need to make testing deterministic.
+   my @lines;
+   foreach my $item ( sort keys %$items ) {
+      next unless exists $versions->{$item};
+      if ( ref($versions->{$item}) eq 'HASH' ) {
+         my $mysql_versions = $versions->{$item};
+         for my $id ( sort keys %$mysql_versions ) {
+            push @lines, join(';', $id, $item, $mysql_versions->{$id});
+         }
+      }
+      else {
+         push @lines, join(';', $general_id, $item, $versions->{$item});
+      }
+   }
+
+   my $client_response = join("\n", @lines) . "\n";
+   return $client_response;
+}
+
 sub parse_server_response {
    my ($self, %args) = @_;
    my @required_args = qw(response);
@@ -297,14 +675,6 @@ sub get_bin_version {
    return $version;
 }
 
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
 1;
 }
 # ###########################################################################