diff --git a/ChangeLog b/ChangeLog
index fca26f0ba..ea9bbd829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-29  Bastien Guerry  <bzg@altern.org>
+
+	* org.el (org-export-as-html): Kill buffer after
+	export when `to-buffer' is nil.
+
+	* org-export-latex.el (org-export-as-latex): Kill buffer after
+	export when `to-buffer' is nil.
+
 2008-02-29  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-agenda-text-search-extra-files): Renamed from
diff --git a/org-export-latex.el b/org-export-latex.el
index 7c71b2711..19c4e2c84 100644
--- a/org-export-latex.el
+++ b/org-export-latex.el
@@ -455,7 +455,7 @@ without even the \begin{document} and \end{document} commands."
 
     ;; finalization
     (unless body-only (insert "\n\\end{document}"))
-    (or to-buffer (save-buffer))
+    (or to-buffer (progn (save-buffer) (kill-buffer (current-buffer))))
     (goto-char (point-min))
     (message "Exporting to LaTeX...done")
     (prog1
diff --git a/org.el b/org.el
index f8c581a19..c7eab7ea8 100644
--- a/org.el
+++ b/org.el
@@ -25891,7 +25891,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  (insert (format "<span style=\"visibility:hidden;\">%s</span>"
 			  (make-string n ?x)))))
 
-      (or to-buffer (save-buffer))
+      (or to-buffer (progn (save-buffer) (kill-buffer (current-buffer))))
       (goto-char (point-min))
       (message "Exporting... done")
       (if (eq to-buffer 'string)