diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index d4371e05d99..f7c3c58c9c8 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+	* org.el (org-default-notes-file): 
+	* org-publish.el (org-publish-timestamp-directory): 
+	* org-id.el (org-id-locations-file): Run file names that begin
+	with a period thru `convert-standard-filename'.
+
 2008-10-12  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org-plot.el: Switch coding system to unix.
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index a8279e3e1e2..406da0c484e 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -276,7 +276,8 @@ When nil, do no timestamp checking and always publish all files."
   :group 'org-publish
   :type 'boolean)
 
-(defcustom org-publish-timestamp-directory "~/.org-timestamps/"
+(defcustom org-publish-timestamp-directory
+  (convert-standard-filename "~/.org-timestamps/")
   "Name of directory in which to store publishing timestamps."
   :group 'org-publish
   :type 'directory)