diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 790a7a9affa..8fe26f58833 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-25  Michael Albinus  <michael.albinus@gmx.de>
+
+	* url-http (url-http-parse-headers): Disable Tramp.  (Bug#6717)
+
 2010-06-12  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
 
 	* url-vars.el (url-privacy-level): Fix doc typo.  (Bug#6406)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 8c203c0eb87..b9aba9f37c9 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -435,7 +435,10 @@ should be shown to the user."
 	(delete-process url-http-process)))))
   (let ((buffer (current-buffer))
 	(class nil)
-	(success nil))
+	(success nil)
+	;; The filename part of a URL could be in remote file syntax,
+	;; see Bug#6717 for an example.  We disable Tramp, therefore.
+	(tramp-mode nil))
     (setq class (/ url-http-response-status 100))
     (url-http-debug "Parsed HTTP headers: class=%d status=%d" class url-http-response-status)
     (url-http-handle-cookies)