2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 13628773137..1be4ca70a80 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14  David Reitter  <david.reitter@gmail.com>
+
+        * url-domsuf.el (url-domsuf-parse-file): Read compressed
+        publicsuffix file if available.
+
 2014-11-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * url-http.el (url-user-agent): New variable, can be function or
diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
index 365cf561ae2..b7f92597e2f 100644
--- a/lisp/url/url-domsuf.el
+++ b/lisp/url/url-domsuf.el
@@ -32,8 +32,12 @@
 
 (defun url-domsuf-parse-file ()
   (with-temp-buffer
-    (insert-file-contents
-     (expand-file-name "publicsuffix.txt" data-directory))
+    (with-auto-compression-mode
+      (insert-file-contents
+       (let* ((suffixfile (expand-file-name "publicsuffix.txt" data-directory))
+              (compressed-file (concat suffixfile ".gz")))
+         (or (and (file-readable-p compressed-file) compressed-file)
+             suffixfile))))
     (let ((domains nil)
           domain exception)
       (while (not (eobp))