diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dad1c3e8e..1462bd9e2 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-12-16  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-latex.el (org-export-latex-tables): Only add a caption when
+	macro in in longtable environments if one has been defined.
+
 	* org-html.el (org-export-as-html): Only take title from buffer if
 	not exporting body-only.
 
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index e481ccd21..9bd9f3777 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1533,7 +1533,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                         (if longtblp
                             (concat "\\begin{longtable}{" align "}\n")
                           (if floatp "\\begin{table}[htb]\n"))
-                        (if (or floatp longtblp)
+                        (if floatp
                             (format
                              "\\caption{%s%s}"
                              (if label (concat "\\\label{" label "}") "")