diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb9bd0a2b..30c24bd6a 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-10  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-latex.el (org-export-latex-first-lines): Fix problem with
+	LaTeX export of first line and selected subtree.
+
 	* org.el (org-shifttab): Interpret arg differently when using only
 	odd levels.
 
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 2c6d4cc4a..5e8814e47 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1003,11 +1003,10 @@ If BEG is non-nil, it is the beginning of the region.
 If END is non-nil, it is the end of the region."
   (save-excursion
     (goto-char (or beg (point-min)))
-    (let* ((pt (point)))
-      (or end
-	  (and (re-search-forward "^\\*+ " end t)
-	       (setq end (match-beginning 0)))
-	  (setq end (point-max)))
+    (let* ((pt (point))
+	   (end (if (re-search-forward "^\\*+ " end t)
+		    (goto-char (match-beginning 0))
+		  (goto-char (or end (point-max))))))
       (prog1
 	  (org-export-latex-content
 	   (org-export-preprocess-string