2 files changed, 3 insertions, 5 deletions

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 51d24cbc1b0..709ea4670a8 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1292,7 +1292,8 @@ file-notify events."
             (when (and user domain)
               (setq user (concat domain ";" user)))
             (url-parse-make-urlobj
-             method (and user (url-hexify-string user)) nil host
+             method (and user (url-hexify-string user))
+             nil (and host (url-hexify-string host))
              (if (stringp port) (string-to-number port) port)
              (and localname (url-hexify-string localname)) nil nil t))
         (url-parse-make-urlobj
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e300b3a58ed..67192e32401 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -818,7 +818,7 @@ Used in `tramp-make-tramp-file-name'.")
   "Regexp matching delimiter between user and host names.
 Derived from `tramp-postfix-user-format'.")
 
-(defconst tramp-host-regexp "[a-zA-Z0-9_.-]+"
+(defconst tramp-host-regexp "[a-zA-Z0-9_.%-]+"
   "Regexp matching host names.")
 
 (defconst tramp-prefix-ipv6-format-alist
@@ -4631,9 +4631,6 @@ Only works for Bourne-like shells."
 (provide 'tramp)
 
 ;;; TODO:
-
-;; * In Emacs 21, `insert-directory' shows total number of bytes used
-;;   by the files in that directory.  Add this here.
 ;;
 ;; * Avoid screen blanking when hitting `g' in dired.  (Eli Tziperman)
 ;;