diff --git a/CONTRIB/ChangeLog b/CONTRIB/ChangeLog
index ebef59538..063e2d6ed 100644
--- a/CONTRIB/ChangeLog
+++ b/CONTRIB/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-29  Bastien Guerry  <bzg@altern.org>
+
+	* lisp/org-bookmark.el (org-bookmark-in-dired)
+	(org-bookmark-when-visiting-a-file)
+	(org-bookmark-use-first-bookmark): New options.
+	(org-bookmark-store-link): Behave according to options.
+
+2008-02-29  Bastien Guerry  <bzg@altern.org>
+
+	* lisp/org-mairix.el (org-mairix): Use `org-link' group.
+
 2008-02-28  Bastien Guerry  <bzg@altern.org>
 
 	* lisp/org-bookmark.el: New file.
diff --git a/CONTRIB/lisp/org-mairix.el b/CONTRIB/lisp/org-mairix.el
index 22078f999..05c8c9b57 100644
--- a/CONTRIB/lisp/org-mairix.el
+++ b/CONTRIB/lisp/org-mairix.el
@@ -44,7 +44,7 @@
 (defgroup org-mairix nil
   "Mairix support/integration in org."
   :tag "Org Mairix"
-  :group 'org)
+  :group 'org-links)
 
 (defcustom org-mairix-threaded-links t
   "Should new links be created as threaded links?