diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 620d16ddf11..1d3fc59e3fe 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -996,6 +996,7 @@ File Shadowing is not available on MS Windows.
 @node Time Stamps
 @subsection Updating Time Stamps Automatically
 @cindex time stamps
+@cindex timestamps
 @cindex modification dates
 @cindex last modified time
 
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index fb3c6cb81da..2aa5ba74dc3 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -307,7 +307,7 @@ See also `time-stamp-count' and `time-stamp-inserts-lines'.")
 
 ;;;###autoload
 (defun time-stamp ()
-  "Update any time stamp string(s) in the buffer.
+  "Update any time stamp strings (timestamps) in the buffer.
 Look for a time stamp template and update it with the current date,
 time, and/or other info.
 
@@ -830,7 +830,7 @@ if they didn't read the documentation)."
             (standard-form
              (concat
               "Conversions that are changing are ambiguous and should be replaced by\n"
-              "stable conversions that makes your intention clear.\n")))
+              "stable conversions that make your intention clear.\n")))
            "\n"
            "The following obsolescent `time-stamp-format' conversion(s) were found:\n\n")))))
       (insert old-form " -- use " new-form)