diff --git a/NEWS b/NEWS
index c3c985bb3..a19744ddd 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@ GNU coreutils NEWS                                    -*- outline -*-
   'numfmt' no longer drops custom suffixes from numbers it cannot fully parse.
   [bug introduced with numfmt in coreutils-8.21]
 
+  'tail -f --pid' can no longer exit upon receiving a non terminating signal.
+  On older Linux systems it may have failed with "Interrupted system call".
+  [bug introduced in coreutils-7.5]
+
   'timeout' will now propagate all terminating signals to the monitored command.
   Previously 'timeout' could have exited and left the monitored command running.
   [bug introduced with timeout in coreutils-7.0]
diff --git a/src/tail.c b/src/tail.c
index e549f5df0..c0d4e0329 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -1684,7 +1684,7 @@ tail_forever_inotify (int wd, struct File_spec *f, int n_files,
               pfd[1].events = pfd[1].revents = 0;
               file_change = poll (pfd, monitor_output + 1, delay);
             }
-          while (file_change == 0);
+          while (file_change == 0 || (file_change < 0 && errno == EINTR));
 
           if (file_change < 0)
             error (EXIT_FAILURE, errno,