diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 536fc4a54e2..adef3a31bfb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-02  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa-file.el (epa-file-write-region): Write the entire buffer
+	content if START is nil.
+
 2008-06-01  Magnus Henoch  <mange@freemail.hu>
 
 	* play/cookie1.el: Remove obsolete TO DO comment.  (It was
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 25edba5a2dc..102e8fd7e49 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -182,6 +182,9 @@
 	       context
 	       (if (stringp start)
 		   (epa-file--encode-coding-string start coding-system)
+		 (unless start
+		   (setq start (point-min))
+		   (setq end (point-max)))
 		 (epa-file--encode-coding-string (buffer-substring start end)
 						 coding-system))
 	       (if (or epa-file-select-keys