diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c20aba188..0175768d9 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-27  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org.el ("saveplace"): If saveplace puts point into an invisible
+	location, make it visible.
+
 	* org-publish.el (org-publish-get-base-files-1): Deal correctly
 	with broken symlinks
 
diff --git a/lisp/org.el b/lisp/org.el
index 9c5abbbdd..2f8496ca5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14257,6 +14257,12 @@ To get rid of the restriction, use \\[org-agenda-remove-restriction-lock]."
        "Make the position visible."
        (org-bookmark-jump-unhide))))
 
+;; Make sure saveplace show the location if it was hidden
+(eval-after-load "saveplace"
+  '(defadvice save-place-find-file-hook (after org-make-visible activate)
+     "Make the position visible."
+     (org-bookmark-jump-unhide)))
+
 (defun org-bookmark-jump-unhide ()
   "Unhide the current position, to show the bookmark location."
   (and (org-mode-p)