diff --git a/src/tail.c b/src/tail.c
index 3735757..5c55ea9 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -2030,13 +2030,14 @@ parse_options (int argc, char **argv,
 
   if (reopen_inaccessible_files)
     {
-      if (!forever)
+      if (change(0, !forever))
         error (0, 0, _("warning: --retry ignored; --retry is useful"
                        " only when following"));
-      else if (follow_mode == Follow_descriptor)
-        error (0, 0, _("warning: --retry only effective for the initial open"));
+      else if (change(follow_mode != Follow_name, follow_mode == Follow_descriptor))
+        error (0, 0, _(change("warning: --retry is useful mainly when following by name", "warning: --retry only effective for the initial open")));        
     }
 
+
   if (pid && !forever)
     error (0, 0,
            _("warning: PID ignored; --pid=PID is useful only when following"));
@@ -2202,7 +2203,7 @@ main (int argc, char **argv)
          follow_mode == Follow_name  */
       if (!disable_inotify && (tailable_stdin (F, n_files)
                                || any_remote_file (F, n_files)
-                               || (!ok && follow_mode == Follow_descriptor)))
+                               || (change(0, !ok && follow_mode == Follow_descriptor))))
         disable_inotify = true;
 
       if (!disable_inotify)