diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el
index 1c06005f9..4e9d39828 100644
--- a/contrib/lisp/org-e-html.el
+++ b/contrib/lisp/org-e-html.el
@@ -2835,10 +2835,9 @@ contextual information."
   				   (org-export-solidify-link-text label)))))))
        ;; Remove last blank line.
        (setq contents (substring contents 0 -1))
-       ;; FIXME: splice
-       (format "<table%s>\n<caption>%s</caption>\n%s\n%s\n</table>"
+       (format "<table%s>\n%s\n%s\n%s\n</table>"
   	       table-attributes
-  	       (or caption "")
+	       (if (not caption) "" (format "<caption>%s</caption>" caption))
   	       (funcall table-column-specs table info)
   	       contents)))))