diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 739c6a774..8558f4618 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-06-09  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-exp.el (org-export-protect-examples): Catch the case of a
+	missing end_example line.
+
 	* org.el (org-set-regexps-and-options): Set `org-file-properties' and
 	`org-file-tags' to nil.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 47602f3ad..691977b20 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1499,7 +1499,7 @@ from the buffer."
   (goto-char (point-min))
   (while (re-search-forward "^#\\+BEGIN_EXAMPLE[ \t]*\n" nil t)
     (goto-char (match-end 0))
-    (while (not (looking-at "#\\+END_EXAMPLE"))
+    (while (and (not (looking-at "#\\+END_EXAMPLE")) (not (eobp)))
       (insert ":  ")
       (beginning-of-line 2)))
   (goto-char (point-min))