diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9192d975..3282882af 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-10  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.el (org-edit-fixed-width-region): Exclude final newline from
+	picture area.
+
 2008-10-09  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org-attach.el (org-attach-delete-all): Renamed from
diff --git a/lisp/org.el b/lisp/org.el
index 1e1061891..3d51fb4d1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5491,7 +5491,7 @@ exit by killing the buffer with \\[org-edit-src-exit]."
 	    (setq beg (point))))
 	(save-excursion
 	  (if (re-search-forward "^[ \t]*[^:]" nil 'move)
-	      (setq end (match-beginning 0))
+	      (setq end (1- (match-beginning 0)))
 	    (setq end (point))))
 	(goto-line line)
 	(if (get-buffer "*Org Edit Picture*")