diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index eb39d3428..833f9ff5f 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -779,7 +779,16 @@ level org-n-level-faces"
        (:foreground "burlywood"))
       (t (,@font))))
   "Face used to highlight LaTeX data, entities and sub/superscript."
-  :group 'org-faces)
+  :group 'org-faces
+  :version "24.4"
+  :package-version '(Org . "8.0"))
+
+(defface org-macro
+  (org-compatible-face 'org-latex-and-related nil)
+  "Face for macros."
+  :group 'org-faces
+  :version "24.4"
+  :package-version '(Org . "8.0"))
 
 (org-copy-face 'mode-line 'org-mode-line-clock
   "Face used for clock display in mode line.")
diff --git a/lisp/org.el b/lisp/org.el
index b6a972c1f..106258705 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6072,6 +6072,8 @@ needs to be inserted at a specific position in the font-lock sequence.")
            (list org-any-target-regexp '(0 'org-target t))
 	   ;; Diary sexps.
 	   '("^&?%%(.*\\|<%%([^>\n]*?>" (0 'org-sexp-date t))
+	   ;; Macro
+	   '("{{{.+}}}" (0 'org-macro t))
 	   '(org-hide-wide-columns (0 nil append))
 	   ;; TODO keyword
 	   (list (format org-heading-keyword-regexp-format