diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dafd59cc4..d7abd5fc5 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
 	(org-export-latex-fontify): Fix regexp bug that takes special
 	care of protecting the right boundary characters in emphasis
 	matches.
+	(org-export-latex-preprocess): Allow multiple arguments to latex
+	macros.
 
 	* org.el (org-make-link-regexps): Use John Gruber's regexp for
 	urls.
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 11891ffac..ad443aa68 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1795,7 +1795,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
   (let ((re (concat "\\\\[a-zA-Z]+\\(?:"
 		    "\\[.*\\]"
 		    "\\)?"
-		    (org-create-multibrace-regexp "{" "}" 3))))
+		    "\\(" (org-create-multibrace-regexp "{" "}" 3)
+		    "\\)\\{1,3\\}")))
     (while (re-search-forward re nil t)
       (unless (save-excursion (goto-char (match-beginning 0))
 			      (equal (char-after (point-at-bol)) ?#))