diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad6aa4cbb..8d7d7ba93 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-26  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-remember.el (org-remember-apply-template): Set local
+	variable `auto-save-visited-file-name' instead of global one.
+
 2009-03-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-feed.el: Re-write.
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index 811fa675a..8ac8452af 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -583,7 +583,7 @@ to be run from that hook to function properly."
 	   (format-time-string "remember-%Y-%m-%d-%H-%M-%S")
 	   org-remember-backup-directory))
     (save-buffer)
-    (setq auto-save-visited-file-name t))
+    (org-set-local 'auto-save-visited-file-name t))
   (when (save-excursion
 	  (goto-char (point-min))
 	  (re-search-forward "%!" nil t))