2 files changed, 6 insertions, 1 deletions

diff --git a/THANKS.in b/THANKS.in
index c5e6057..a77ecd4 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -301,4 +301,5 @@ Pall Sigurdsson
 Sebastian Schmidt
 Simon Kainz
 Steve Weinreich
+Geoff Oakham
 Tim Laszlo
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index c0bb32f..95ac7b4 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -482,7 +482,11 @@ run_ping (const char *cmd, const char *addr)
         /* check stderr, setting at least WARNING if there is output here */
         /* Add warning into warn_text */
         while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
+                if (
+                        ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
+                        && ! strstr(buf,"Warning: time of day goes back")
+
+                ) {
                         if (verbose >= 3) {
                                 printf("Got stderr: %s", buf);
                         }