diff --git a/lisp/tramp.el b/lisp/tramp.el
index f97ed66c..b35c2017 100644
--- a/lisp/tramp.el
+++ b/lisp/tramp.el
@@ -1061,7 +1061,10 @@ Derived from `tramp-prefix-port-format'.")

 (defconst tramp-host-with-port-regexp
   (rx
-   (group (regexp tramp-host-regexp))
+   (group (| (regexp tramp-host-regexp)
+	     (: (regexp tramp-prefix-ipv6-regexp)
+		(? (regexp tramp-ipv6-regexp))
+		(regexp tramp-postfix-ipv6-regexp))))
    (regexp tramp-prefix-port-regexp)
    (group (regexp tramp-port-regexp)))
   "Regexp matching host names with port numbers.")