diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f60bcc2f4..3ed955062 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-10  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-exp.el (org-export-handle-export-tags): Remove inlinetask
+	END if present.
+
 2009-10-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-tables): Don't format in
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index d1cb0e445..c2561a7ce 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1603,8 +1603,10 @@ removed as well."
 	(when (org-at-heading-p)
 	  (org-back-to-heading t)
 	  (setq beg (point))
-	  (org-end-of-subtree t)
-	  (delete-region beg (point)))))
+	  (org-end-of-subtree t t)
+	  (delete-region beg (point))
+	  (when (featurep 'org-inlinetask)
+	    (org-inlinetask-remove-END-maybe)))))
     ;; Remove everything that is now still marked for deletion
     (goto-char (point-min))
     (while (setq beg (text-property-any (point-min) (point-max) :org-delete t))