2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c0a099119d..40690692e88 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-14  João Távora  <joaotavora@gmail.com>
+
+        * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+        links.  (Bug#17217).
+
 2014-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 8b68b6f4bc7..58442575ad2 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -610,7 +610,7 @@ size, and full-buffer size."
          (concat (nth 3 base) url))
         (t
          ;; Totally relative.
-         (concat (car base) (cadr base) url))))
+         (concat (car base) (expand-file-name url (cadr base))))))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))