diff --git a/README.md b/README.markdown
similarity index 100%
rename from README.md
rename to README.markdown
diff --git a/manifests/client.pp b/manifests/client.pp
index 2fbbc98..4e042b5 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -215,7 +215,7 @@
   $incr_fill             = false,
   $partial_age_max       = false,
   $blackout_bad_ping_limit = false,
-  $ping_max_msec         = 20,
+  $ping_max_msec         = false,
   $blackout_good_cnt     = false,
   $backups_disable       = false,
   $xfer_method           = 'rsync',
diff --git a/templates/config.pl.erb b/templates/config.pl.erb
index 6508599..2f4d716 100644
--- a/templates/config.pl.erb
+++ b/templates/config.pl.erb
@@ -183,6 +183,7 @@
 $Conf{FixedIPNetBiosNameCheck} = 0;
 $Conf{PingPath} = '/bin/ping';
 $Conf{PingCmd} = '$pingPath -c 1 -w 3 $host';
+$Conf{PingMaxMsec} = 20;
 $Conf{CompressLevel} = 3;
 $Conf{ClientTimeout} = 72000;
 $Conf{MaxOldPerPCLogFiles} = 12;