diff --git a/bin/pt-archiver b/bin/pt-archiver
index f635f644..6bebc4b4 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -28,7 +28,7 @@ BEGIN {
       Daemon
       MasterSlave
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4675,15 +4675,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -5276,7 +5276,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -5409,7 +5409,7 @@ sub main {
          $o->save_error("--bulk-delete is meaningless with --limit 1");
       }
 
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
 
    }
 
@@ -5809,7 +5809,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $src->{dbh}, dsn => $src->{dsn} },
             ( $dst ? { dbh => $dst->{dbh}, dsn => $dst->{dsn} } : () ),
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 39c607a3..188d6627 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -28,7 +28,7 @@ BEGIN {
       MySQLConfigComparer
       ReportFormatter
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4349,15 +4349,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4950,7 +4950,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4991,7 +4991,7 @@ sub main {
       if ( @ARGV < 1 ) {
         $o->save_error("Specify at least one file or DSN on the command line");
       }
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
    }
 
    $o->usage_or_errors();
@@ -5068,7 +5068,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ map({ +{ dbh => $_->dbh, dsn => $_->dsn } } @cxn) ],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index de994f58..8f3308c1 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -25,7 +25,7 @@ BEGIN {
       DSNParser
       Daemon
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -3265,15 +3265,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -3866,7 +3866,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -3978,7 +3978,7 @@ sub main {
          $o->save_error("--dest requires a 't' (table) part");
       }
 
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
       
       # Avoid running forever with zero second interval.
       if ( $o->get('run-time') && !$o->get('interval') ) {
@@ -4050,7 +4050,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $dbh, dsn => $source_dsn },
             ($dest_dsn ? { dbh => $dest_dsn, dsn => $dest_dsn } : ()),
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 0ccff69e..c011fdb7 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -23,7 +23,7 @@ BEGIN {
       DiskstatsGroupBySample
       DiskstatsMenu
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4160,15 +4160,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4761,7 +4761,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4803,7 +4803,7 @@ sub main {
       if ( !$o->get('columns-regex') ) {
          $o->save_error("A regex pattern for --column-regex must be specified");
       }
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
    }
 
    $o->usage_or_errors();
@@ -4812,7 +4812,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(protocol => $o->get('version-check'));
+      VersionCheck::version_check(protocol => $o->get('version-check'));
    }
 
    # ########################################################################
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 2754a197..a9a1ec70 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -24,7 +24,7 @@ BEGIN {
       Schema
       SchemaIterator
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4021,15 +4021,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4622,7 +4622,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # #############################################################################
@@ -4668,7 +4668,7 @@ sub main {
 
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->get('set-vars'));
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -4700,7 +4700,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ {dbh => $dbh, dsn => $dsn} ],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-find b/bin/pt-find
index 810d357c..fc5f73a0 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -20,7 +20,7 @@ BEGIN {
       TableParser
       Daemon
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -2833,15 +2833,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -3434,7 +3434,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -3739,7 +3739,7 @@ sub main {
       $o->save_error("--server-id regex doesn't capture digits with (\\d+)");
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -3841,7 +3841,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [{dbh => $dbh, dsn => $dsn}],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 9de07934..59592687 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -20,7 +20,7 @@ BEGIN {
       Daemon
       Transformers
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -2775,15 +2775,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -3376,7 +3376,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -3438,7 +3438,7 @@ sub main {
          $o->save_error("--dest requires a 't' (table) part");
       }
 
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
    }
 
    $o->usage_or_errors();
@@ -3500,7 +3500,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $dbh, dsn => $src_dsn },
             ($dst_dbh ? { dbh => $dst_dbh, dsn => $dst_dsn } : ())
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 2b43d9ee..008801af 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -23,7 +23,7 @@ BEGIN {
       Retry
       Transformers
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4001,15 +4001,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4602,7 +4602,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4692,7 +4692,7 @@ sub main {
       $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -5072,7 +5072,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ {dbh => $dbh, dsn => $dsn} ],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 9531b88a..9c030c34 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -30,7 +30,7 @@ BEGIN {
       IndexUsage
       Progress
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -5476,15 +5476,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -6077,7 +6077,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -6136,7 +6136,7 @@ sub main {
          }
       }
       
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
    }
 
    $o->usage_or_errors();
@@ -6281,7 +6281,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $dbh, dsn => $dsn },
             ($res_dbh ? { dbh => $res_dbh, dsn => $res_dsn } : ())
diff --git a/bin/pt-kill b/bin/pt-kill
index cee09ce3..d73cdb71 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -32,7 +32,7 @@ BEGIN {
       Retry
       Cxn
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -5698,15 +5698,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -6299,7 +6299,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -6371,7 +6371,7 @@ sub main {
       $o->save_error("Invalid value for --victims: $victims");
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -6654,7 +6654,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ ($dbh ? { dbh => $dbh, dsn => $cxn->dsn() } : ()) ],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 53eba275..217429cc 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -39,7 +39,7 @@ BEGIN {
       CleanupTask
       IndexLength
       HTTPMicro
-      Pingback
+      VersionCheck
       Percona::XtraDB::Cluster
    ));
 }
@@ -7148,15 +7148,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -7749,7 +7749,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -7968,7 +7968,7 @@ sub main {
       $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors(); 
 
@@ -8258,7 +8258,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ map({ +{ dbh => $_->dbh(), dsn => $_->dsn() } }
             $cxn, ($slaves ? @$slaves : ())) ],
          protocol  => $o->get('version-check'),
diff --git a/bin/pt-query-advisor b/bin/pt-query-advisor
index ece4d479..5803396c 100755
--- a/bin/pt-query-advisor
+++ b/bin/pt-query-advisor
@@ -36,7 +36,7 @@ BEGIN {
       TableParser
       ReportFormatter
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -7431,15 +7431,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -8032,7 +8032,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -8099,7 +8099,7 @@ sub main {
             . "rule_id, query_id, none");
       }
 
-      Pingback::validate_options($o);
+      VersionCheck::validate_options($o);
    }
 
    $o->usage_or_errors();
@@ -8430,7 +8430,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             ($review_dbh ? { dbh => $review_dbh, dsn => $review_dsn } : ()),
             ($dbh        ? { dbh => $dbh,        dsn => $dsn        } : ()),
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 7ed101b0..f927070a 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -53,7 +53,7 @@ BEGIN {
       Runtime
       Pipeline
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -13060,15 +13060,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -13661,7 +13661,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -13812,7 +13812,7 @@ sub main {
       $o->save_error($EVAL_ERROR);
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -14902,7 +14902,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             ($qv_dbh ? { dbh => $qv_dbh, dsn => $review_dsn } : ()),
             ($ps_dbh ? { dbh => $ps_dbh, dsn => $ps_dsn     } : ()),
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 5f4daf70..c89d7013 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -25,7 +25,7 @@ BEGIN {
       Transformers
       Retry
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -3376,15 +3376,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -3977,7 +3977,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4029,7 +4029,7 @@ sub main {
       $o->set('run-time', max($o->get('run-time'), 1));
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -4088,7 +4088,7 @@ sub main {
       my $tmp_master_dsn = $master_dsn
                          ? $master_dsn
                          : { h => $status->{master_host}, P => $status->{master_port} };
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $slave_dbh,  dsn => $slave_dsn      },
             { dbh => $master_dbh, dsn => $tmp_master_dsn }
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index c0362677..7b5c6fcb 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -26,7 +26,7 @@ BEGIN {
       MasterSlave
       Daemon
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4000,15 +4000,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4601,7 +4601,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4665,7 +4665,7 @@ sub main {
       $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -4772,7 +4772,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ { dbh => $dbh, dsn => $dsn }, @servers_to_watch ],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 68c7fb3a..530ec3f5 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -15,7 +15,7 @@ BEGIN {
    $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
       Percona::Toolkit
       HTTPMicro
-      Pingback
+      VersionCheck
       DSNParser
       OptionParser
       Lmo::Utils
@@ -714,15 +714,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -1315,7 +1315,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -8648,7 +8648,7 @@ sub main {
       $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
  
@@ -9237,7 +9237,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [
             { dbh => $master_dbh, dsn => $master_dsn },
             map({ +{ dbh => $_->dbh(), dsn => $_->dsn() } } @$slaves)
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 6f6abf9f..02b4e77b 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -41,7 +41,7 @@ BEGIN {
       Transformers
       Retry
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -9121,15 +9121,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -9722,7 +9722,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -9858,7 +9858,7 @@ sub main {
       $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -9971,7 +9971,7 @@ sub main {
    } @dsns;
 
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [@instances],
          protocol  => $o->get('version-check'),
       );
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index 1b2c02fc..3856b4a3 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -28,6 +28,7 @@ BEGIN {
       Outfile
       Retry
       HTTPMicro
+      VersionCheck
    ));
 }
 
@@ -3768,6 +3769,611 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # End HTTPMicro package
 # ###########################################################################
 
+# ###########################################################################
+# VersionCheck 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/VersionCheck.pm
+#   t/lib/VersionCheck.t
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionCheck;
+
+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;
+};
+
+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) = @args{qw(instances ua)};
+
+   $ua ||= HTTPMicro->new( timeout => 5 );
+
+   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 = __PACKAGE__->parse_server_response(
+      response => $response->{content}
+   );
+   die "Failed to parse server requested programs: $response->{content}"
+      if !scalar keys %$items;
+      
+   my $versions = __PACKAGE__->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 = __PACKAGE__->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 parse_server_response {
+   my ($self, %args) = @_;
+   my @required_args = qw(response);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($response) = @args{@required_args};
+
+   my %items = map {
+      my ($item, $type, $vars) = split(";", $_);
+      if ( !defined $args{split_vars} || $args{split_vars} ) {
+         $vars = [ split(",", ($vars || '')) ];
+      }
+      $item => {
+         item => $item,
+         type => $type,
+         vars => $vars,
+      };
+   } split("\n", $response);
+
+   PTDEBUG && _d('Items:', Dumper(\%items));
+
+   return \%items;
+}
+
+sub get_versions {
+   my ($self, %args) = @_;
+   my @required_args = qw(items);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg arugment" unless $args{$arg};
+   }
+   my ($items) = @args{@required_args};
+
+   my %versions;
+   foreach my $item ( values %$items ) {
+      next unless $self->valid_item($item);
+
+      eval {
+         my $func    = 'get_' . $item->{type};
+         my $version = $self->$func(
+            item      => $item,
+            instances => $args{instances},
+         );
+         if ( $version ) {
+            chomp $version unless ref($version);
+            $versions{$item->{item}} = $version;
+         }
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error getting version for', Dumper($item), $EVAL_ERROR);
+      }
+   }
+
+   return \%versions;
+}
+
+sub valid_item {
+   my ($self, $item) = @_;
+   return unless $item;
+
+   if ( ($item->{type} || '') !~ m/
+         ^(?:
+             os_version
+            |perl_version
+            |perl_module_version
+            |mysql_variable
+            |bin_version
+         )$/x ) {
+      PTDEBUG && _d('Invalid type:', $item->{type});
+      return;
+   }
+
+   return 1;
+}
+
+sub get_os_version {
+   my ($self) = @_;
+
+   if ( $OSNAME eq 'MSWin32' ) {
+      require Win32;
+      return Win32::GetOSDisplayName();
+   }
+
+  chomp(my $platform = `uname -s`);
+  PTDEBUG && _d('platform:', $platform);
+  return $OSNAME unless $platform;
+
+   chomp(my $lsb_release
+            = `which lsb_release 2>/dev/null | awk '{print \$1}'` || '');
+   PTDEBUG && _d('lsb_release:', $lsb_release);
+
+   my $release = "";
+
+   if ( $platform eq 'Linux' ) {
+      if ( -f "/etc/fedora-release" ) {
+         $release = `cat /etc/fedora-release`;
+      }
+      elsif ( -f "/etc/redhat-release" ) {
+         $release = `cat /etc/redhat-release`;
+      }
+      elsif ( -f "/etc/system-release" ) {
+         $release = `cat /etc/system-release`;
+      }
+      elsif ( $lsb_release ) {
+         $release = `$lsb_release -ds`;
+      }
+      elsif ( -f "/etc/lsb-release" ) {
+         $release = `grep DISTRIB_DESCRIPTION /etc/lsb-release`;
+         $release =~ s/^\w+="([^"]+)".+/$1/;
+      }
+      elsif ( -f "/etc/debian_version" ) {
+         chomp(my $rel = `cat /etc/debian_version`);
+         $release = "Debian $rel";
+         if ( -f "/etc/apt/sources.list" ) {
+             chomp(my $code_name = `awk '/^deb/ {print \$3}' /etc/apt/sources.list | awk -F/ '{print \$1}'| awk 'BEGIN {FS="|"} {print \$1}' | sort | uniq -c | sort -rn | head -n1 | awk '{print \$2}'`);
+             $release .= " ($code_name)" if $code_name;
+         }
+      }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
+      elsif ( `ls /etc/*release 2>/dev/null` ) {
+         if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
+            $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
+         }
+         else {
+            $release = `cat /etc/*release | head -n1`;
+         }
+      }
+   }
+   elsif ( $platform =~ m/(?:BSD|^Darwin)$/ ) {
+      my $rel = `uname -r`;
+      $release = "$platform $rel";
+   }
+   elsif ( $platform eq "SunOS" ) {
+      my $rel = `head -n1 /etc/release` || `uname -r`;
+      $release = "$platform $rel";
+   }
+
+   if ( !$release ) {
+      PTDEBUG && _d('Failed to get the release, using platform');
+      $release = $platform;
+   }
+   chomp($release);
+
+   $release =~ s/^"|"$//g;
+
+   PTDEBUG && _d('OS version =', $release);
+   return $release;
+}
+
+sub get_perl_version {
+   my ($self, %args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $version = sprintf '%vd', $PERL_VERSION;
+   PTDEBUG && _d('Perl version', $version);
+   return $version;
+}
+
+sub get_perl_module_version {
+   my ($self, %args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $var          = $item->{item} . '::VERSION';
+   my $version      = _get_scalar($var);
+   PTDEBUG && _d('Perl version for', $var, '=', "$version");
+
+   return $version ? "$version" : $version;
+}
+
+sub _get_scalar {
+   no strict;
+   return ${*{shift()}};
+}
+
+sub get_mysql_variable {
+   my $self = shift;
+   return $self->_get_from_mysql(
+      show => 'VARIABLES',
+      @_,
+   );
+}
+
+sub _get_from_mysql {
+   my ($self, %args) = @_;
+   my $show      = $args{show};
+   my $item      = $args{item};
+   my $instances = $args{instances};
+   return unless $show && $item;
+
+   if ( !$instances || !@$instances ) {
+      if ( $ENV{PTVCDEBUG} || PTDEBUG ) {
+         _d('Cannot check', $item, 'because there are no MySQL instances');
+      }
+      return;
+   }
+
+   my @versions;
+   my %version_for;
+   foreach my $instance ( @$instances ) {
+      my $dbh = $instance->{dbh};
+      local $dbh->{FetchHashKeyName} = 'NAME_lc';
+      my $sql = qq/SHOW $show/;
+      PTDEBUG && _d($sql);
+      my $rows = $dbh->selectall_hashref($sql, 'variable_name');
+
+      my @versions;
+      foreach my $var ( @{$item->{vars}} ) {
+         $var = lc($var);
+         my $version = $rows->{$var}->{value};
+         PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
+            'on', $instance->{name});
+         push @versions, $version;
+      }
+
+      $version_for{ $instance->{id} } = join(' ', @versions);
+   }
+
+   return \%version_for;
+}
+
+sub get_bin_version {
+   my ($self, %args) = @_;
+   my $item = $args{item};
+   my $cmd  = $item->{item};
+   return unless $cmd;
+
+   my $sanitized_command = File::Basename::basename($cmd);
+   PTDEBUG && _d('cmd:', $cmd, 'sanitized:', $sanitized_command);
+   return if $sanitized_command !~ /\A[a-zA-Z0-9_-]+\z/;
+
+   my $output = `$sanitized_command --version 2>&1`;
+   PTDEBUG && _d('output:', $output);
+
+   my ($version) = $output =~ /v?([0-9]+\.[0-9]+(?:\.[\w-]+)?)/;
+
+   PTDEBUG && _d('Version for', $sanitized_command, '=', $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;
+}
+# ###########################################################################
+# End VersionCheck package
+# ###########################################################################
+
 # ###########################################################################
 # This is a combination of modules and programs in one -- a runnable module.
 # http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
@@ -3852,7 +4458,7 @@ sub main {
       $o->save_error('Specify at least one host DSN');
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -3870,13 +4476,14 @@ sub main {
    # ########################################################################
    # Do the version-check
    # ########################################################################
-   if ( $o->get('version-check') ne 'off'
-        && (!$o->has('quiet') || !$o->get('quiet')) ) {
-#      Pingback::version_check(
-#         instances => [ map({ +{ dbh => $_->{dbh}, dsn => $_->{dsn} } } @$hosts) ],
+#   if ( $o->get('version-check') ne 'off'
+#        && (!$o->has('quiet') || !$o->get('quiet')) ) {
+#         instances => [
+#            map({ +{ dbh => $_->{dbh}, dsn => $_->{dsn} } } @$hosts)
+#         ],
 #         protocol  => $o->get('version-check'),
 #      );
-   }
+#   }
 
    # ########################################################################
    # Disable the query cache.
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 9c20df94..7fe3aadc 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -29,7 +29,7 @@ BEGIN {
       AdvisorRules
       VariableAdvisorRules
       HTTPMicro
-      Pingback
+      VersionCheck
    ));
 }
 
@@ -4283,15 +4283,15 @@ if ( $INC{"IO/Socket/SSL.pm"} ) {
 # ###########################################################################
 
 # ###########################################################################
-# Pingback package
+# VersionCheck 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
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
 # See https://launchpad.net/percona-toolkit for more information.
 # ###########################################################################
 {
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -4884,7 +4884,7 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
 
 # ###########################################################################
@@ -4929,7 +4929,7 @@ sub main {
       }
    }
 
-   Pingback::validate_options($o);
+   VersionCheck::validate_options($o);
    
    $o->usage_or_errors();
 
@@ -5006,7 +5006,7 @@ sub main {
    # Do the version-check
    # ########################################################################
    if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      Pingback::version_check(
+      VersionCheck::version_check(
          instances => [ ($dbh ? { dbh => $dbh, dsn => $dsn } : ()) ],
          protocol  => $o->get('version-check'),
       );
diff --git a/lib/Pingback.pm b/lib/VersionCheck.pm
similarity index 99%
rename from lib/Pingback.pm
rename to lib/VersionCheck.pm
index 0f7a352e..58b57e9f 100644
--- a/lib/Pingback.pm
+++ b/lib/VersionCheck.pm
@@ -1,4 +1,4 @@
-# This program is copyright 2012 Percona Ireland Ltd.
+# This program is copyright 2012-2013 Percona Ireland Ltd.
 # Feedback and improvements are welcome.
 #
 # THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
@@ -15,12 +15,10 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA.
 # ###########################################################################
-# Pingback package
+# VersionCheck package
 # ###########################################################################
 {
-# Package: Pingback
-# Pingback gets and reports program versions to Percona.
-package Pingback;
+package VersionCheck;
 
 use strict;
 use warnings FATAL => 'all';
@@ -683,5 +681,5 @@ sub _d {
 1;
 }
 # ###########################################################################
-# End Pingback package
+# End VersionCheck package
 # ###########################################################################
diff --git a/t/lib/VersionCheck.t b/t/lib/VersionCheck.t
index c00e54e0..81d903c9 100644
--- a/t/lib/VersionCheck.t
+++ b/t/lib/VersionCheck.t
@@ -12,7 +12,7 @@ use English qw(-no_match_vars);
 use Test::More;
 use Data::Dumper;
 
-use Pingback;
+use VersionCheck;
 use DSNParser;
 use Sandbox;
 use PerconaTest;
@@ -23,7 +23,7 @@ my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $master_dbh = $sb->get_dbh_for('master');
 my $slave1_dbh = $sb->get_dbh_for('slave1');
 
-my $vc = 'Pingback';
+my $vc = 'VersionCheck';
 
 sub test_v {
    my (%args) = @_;
@@ -52,7 +52,7 @@ sub test_v {
          },
       ],
    );
-   diag(Dumper($versions));
+
    is_deeply(
       $versions,
       $args{versions},
@@ -168,7 +168,6 @@ SKIP: {
 # at least know that an OS should have these two things: a word
 # and version with at least major and minor numbers.
 my $os = $vc->get_os_version;
-diag($os);
 
 like(
    $os,
@@ -216,4 +215,3 @@ is_deeply(
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox")
    if $master_dbh;
 done_testing;
-exit;