diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08b441d8a..e25920a58 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-table-map-tables): Make sure cursor is back at table
+	beginning after funcall.
+
 	* org-agenda.el (org-agenda-bulk-action): Make sure parents are
 	handled before children, and do not error if an entry is not
 	found, probably because it hase been remove when the parent was
diff --git a/lisp/org.el b/lisp/org.el
index ccd6159da..9127f3ed5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3028,8 +3028,10 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
       (while (re-search-forward org-table-any-line-regexp nil t)
 	(message "Mapping tables: %d%%" (/ (* 100.0 (point)) (buffer-size)))
 	(beginning-of-line 1)
-	(if (looking-at org-table-line-regexp)
-	    (save-excursion (funcall function)))
+	(when (looking-at org-table-line-regexp)
+	  (save-excursion (funcall function))
+	  (or (looking-at org-table-line-regexp)
+	      (forward-char 1)))
 	(re-search-forward org-table-any-border-regexp nil 1))))
   (message "Mapping tables: done"))