diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 244cd9659..45397b4a5 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-30  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-remember.el (org-remember-apply-template): Improve auto-save
+	behavior.
+
 2009-04-29  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-preprocess): Also protect
diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index c627324d1..60d7563ee 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -596,12 +596,14 @@ to be run from that hook to function properly."
   (when org-remember-backup-directory
     (unless (file-directory-p org-remember-backup-directory)
       (make-directory org-remember-backup-directory))
+    (org-set-local 'auto-save-file-name-transforms nil)
     (setq buffer-file-name
 	  (expand-file-name
 	   (format-time-string "remember-%Y-%m-%d-%H-%M-%S")
 	   org-remember-backup-directory))
     (save-buffer)
-    (org-set-local 'auto-save-visited-file-name t))
+    (org-set-local 'auto-save-visited-file-name t)
+    (auto-save-mode 1))
   (when (save-excursion
 	  (goto-char (point-min))
 	  (re-search-forward "%!" nil t))