diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f1da5aa7..f82204323 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-05  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-additional-option-like-keywords): Add two more
+	keywords.
+
 2009-03-04  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-export-format-source-code-or-example): Mark
diff --git a/lisp/org.el b/lisp/org.el
index 156975a60..9a36ba636 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8302,6 +8302,7 @@ This function can be used in a hook."
     "BEGIN_QUOTE" "END_QUOTE"
     "BEGIN_VERSE" "END_VERSE"
     "BEGIN_SRC" "END_SRC"
+    "CATEGORY" "COLUMNS"
     "CAPTION" "LABEL" "ATTR_HTML" "ATTR_LaTeX"))
 
 (defcustom org-structure-template-alist