diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a2e3971d..9ea4c2940 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,8 @@
 	(org-export-latex-special-chars): Post-process entity replacement.
 	(org-export-latex-fontify-headline): Do not yet protect defined
 	entities - these will be taken care of later.
+	(org-export-latex-tables, org-export-latex-links): Format the
+	caption properly.
 
 	* org-entities.el (org-entities-user): Fix typo.
 
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 243620a1d..e282c8ad4 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1589,7 +1589,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                              (string-match "\\<align=\\([^ \t\n\r,]+\\)" attr)
                              (match-string 1 attr))
                   floatp (or caption label))
-	    (setq caption (and caption (org-export-latex-content caption)))
+	    (setq caption (and caption (org-export-latex-fontify-headline caption)))
             (setq lines (org-split-string raw-table "\n"))
             (apply 'delete-region (list beg end))
             (when org-export-table-remove-special-lines
@@ -1846,7 +1846,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 				       raw-path))))))))
        ;; process with link inserting
        (apply 'delete-region remove)
-       (setq caption (and caption (org-export-latex-content caption)))
+       (setq caption (and caption (org-export-latex-fontify-headline caption)))
        (cond ((and imgp
 		   (plist-get org-export-latex-options-plist :inline-images))
 	      ;; OK, we need to inline an image