2 files changed, 7 insertions, 6 deletions

diff --git a/etc/NEWS b/etc/NEWS
index d74e570d6ff..4e8567e2fdb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -253,6 +253,11 @@ details.
 *** New setf-able function to access and set image parameters is
 provided: 'image-property'.
 
+---
+** The default 'Info-default-directory-list' no longer checks some obsolete
+directory suffixes (gnu, gnu/lib, gnu/lib/emacs, emacs, lib, lib/emacs)
+when searching for info directories.
+
 +++
 ** The commands that add ChangeLog entries now prefer a VCS root directory
 for the ChangeLog file, if none already exists.  Customize
diff --git a/lisp/info.el b/lisp/info.el
index ae46fba25b9..5a1cec11dd2 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -192,12 +192,8 @@ A header-line does not scroll with the rest of the buffer."
           (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))
          (suffixes
           ;; Subdirectories in each directory tree that may contain info
-          ;; directories.  Most of these are rather outdated.
-          ;; It ought to be fine to stop checking the "emacs" ones now,
-          ;; since this is Emacs and we have not installed info files
-          ;; into such directories for a looong time...
-          '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
-            "emacs/" "lib/" "lib/emacs/"))
+          ;; directories.
+          '("share/" ""))
          (standard-info-dirs
           (apply #'nconc
                  (mapcar (lambda (pfx)