diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d59b3e5c5..607061f50 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-06  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-entities.el (org-macs): Require org-macs, to be sure that we
+	have `declare-function' defined.
+
 2010-04-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-classes): Update docstring.
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index efd170a8a..35a245bbd 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -26,6 +26,8 @@
 ;;
 ;;; Commentary:
 
+(require 'org-macs)
+
 (declare-function org-table-align "org-table" ())
 
 (eval-when-compile