diff --git a/ChangeLog b/ChangeLog
index afb0c310a..62e2f6aea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-05  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-publish.el (org-publish-timestamp-filename): Protect ":" in
+	file name path under windows.
+
 	* org.el (org-update-checkbox-count): Revamped to deal with
 	hierarchical beckboxes.  This was a patch from Miguel
 	A. Figueroa-Villanueva. 
diff --git a/org-publish.el b/org-publish.el
index 0a8e90198..e0b7a1847 100644
--- a/org-publish.el
+++ b/org-publish.el
@@ -291,14 +291,13 @@ files."
 
 ;;;; Timestamp-related functions
 
-
 (defun org-publish-timestamp-filename (filename)
   "Return path to timestamp file for filename FILENAME."
-  (while (string-match "~\\|/" filename)
+  (while (string-match (if (eq system-type 'windows-nt) "~\\|/\\|:" "~\\|/")
+		       filename)
     (setq filename (replace-match "_" nil t filename)))
   (concat org-publish-timestamp-directory filename ".timestamp"))
 
-
 (defun org-publish-needed-p (filename)
   "Check whether file should be published.
 If org-publish-use-timestamps-flag is set to nil, this function always