diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eda522447..b58e4e1d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-28  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org-clock.el (org-clock-save): Insert time stamp without
+	dependence on time-stamp.el.
 
 2008-10-27  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 6eaa2045d..6fc7b15dc 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1016,7 +1016,9 @@ the currently selected interval size."
   (with-current-buffer (find-file (expand-file-name org-clock-persist-file))
     (progn (delete-region (point-min) (point-max))
 	   ;;Store clock
-	   (insert (format ";; org-persist.el - %s at %s\n" system-name (time-stamp-string)))
+	   (insert (format ";; org-persist.el - %s at %s\n"
+			   system-name (format-time-string
+					(cdr (org-time-stamp-formats)))))
 	   (if (and org-clock-persist (marker-buffer org-clock-marker)
 		    (or (not org-clock-persist-query-save)
 			(y-or-n-p (concat "Save current clock ("
@@ -1042,8 +1044,6 @@ the currently selected interval size."
 
 (defvar org-clock-loaded nil)
 
-(require 'timestamp)
-
 (defun org-clock-load ()
   "Load various clock-related data from disk, optionally resuming
 a stored clock"