diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b58fab43e..4dc5a0933 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-18  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-html.el (org-export-as-html-and-open): Add argument to
+	kill-buffer.
+
 2010-04-16  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-export-define-heading-targets): Fix bug in
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 74f3a55d5..0903bff08 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -455,7 +455,7 @@ headlines.  The default is 3.  Lower levels will become bulleted lists."
   (org-export-as-html arg 'hidden)
   (org-open-file buffer-file-name)
   (when org-export-kill-product-buffer-when-displayed
-    (kill-buffer)))
+    (kill-buffer (current-buffer))))
 
 ;;;###autoload
 (defun org-export-as-html-batch ()