diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 6189ef2d41d..2d6ab6592e5 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3704,6 +3704,17 @@ host name of the previous hop is reused.  Therefore, the following
 file name is equivalent to the previous example:
 @samp{@trampfn{ssh@value{postfixhop}remotehost|su,,}}.
 
+@defopt tramp-completion-multi-hop-methods
+When this list includes the last method in a multi-hop connection, the
+remote host will be queried for a list of completion candidates.  This
+can, for example, provide a list of running docker or podman
+containers on the remote host.
+
+@lisp
+(customize-set-variable 'tramp-completion-multi-hop-methods
+ `(,tramp-docker-method ,tramp-podman-method))
+@end lisp
+@end defopt
 
 @node Home directories
 @section Expanding @file{~} to home directory
diff --git a/etc/NEWS b/etc/NEWS
index bbf4b67fe34..3686bc42f19 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -459,6 +459,13 @@ This macro could wrap code which handles local files only.  Due to the
 temporary deactivation of remote files, it results in a slightly
 improved performance of file name handling in Emacs.
 
++++
+*** New user option 'tramp-completion-multi-hop-methods'.
+It contains a list of connection methods for which completion should
+be attempted at the end of a multi-hop chain.  This allows completion
+candidates to include a list of, for example, containers running on a
+remote docker host.
+
 ** EWW
 
 +++