diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c3d419d0aa..06313acc705 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-08  Glenn Morris  <rgm@gnu.org>
+
+	* net/browse-url.el (browse-url-xdg-open): Shell-quote url.  (Bug#7166)
+
 2010-10-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cus-edit.el (custom-variable, custom-face): Doc fix.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index d98c72570a4..65b45aecf3e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -939,7 +939,7 @@ Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
   (interactive (browse-url-interactive-arg "URL: "))
   (call-process "/bin/sh" nil nil nil
 		"-c"
-		(concat "nohup xdg-open " url
+		(concat "nohup xdg-open " (shell-quote-argument url)
 			">/dev/null 2>&1 </dev/null")))
 
 ;;;###autoload
@@ -1571,5 +1571,4 @@ from `browse-url-elinks-wrapper'."
 
 (provide 'browse-url)
 
-;; arch-tag: d2079573-5c06-4097-9598-f550fba19430
 ;;; browse-url.el ends here