diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c9939b45..0505550b9 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* org.el (org-default-properties): Add STYLE property.
 	(org-files-list): Use the function call to get the files.
+	(org-additional-option-like-keywords): Add SETUPFILE to completion
+	list.
 
 2009-10-26  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/org.el b/lisp/org.el
index d72034778..2a227b98e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9194,6 +9194,7 @@ This function can be used in a hook."
     "BEGIN_SRC" "END_SRC"
     "CATEGORY" "COLUMNS"
     "CAPTION" "LABEL"
+    "SETUPFILE"
     "BIND"
     "MACRO"))