diff --git a/helm-adaptative.el b/helm-adaptative.el
index 23f921413..7f86298f2 100644
--- a/helm-adaptative.el
+++ b/helm-adaptative.el
@@ -32,18 +32,18 @@
   "~/.emacs.d/helm-c-adaptive-history"
   "Path of file where history information is stored."
   :type 'string
-  :group 'helm-config)
+  :group 'helm-adapt)
 
 (defcustom helm-c-adaptive-history-length 50
   "Maximum number of candidates stored for a source."
   :type 'number
-  :group 'helm-config)
+  :group 'helm-adapt)
 
 (defcustom helm-c-use-adaptative-sorting nil
   "Wheter to use or not adaptative sorting.
 Even if a source use it, it will have no effect when set to nil."
   :type 'boolean
-  :group 'helm-config)
+  :group 'helm-adapt)
 
 
 ;; Internal
diff --git a/helm-mode.el b/helm-mode.el
index 6d19ad148..2db1c7de3 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -22,6 +22,10 @@
 (require 'helm-files)
 
 
+(defgroup helm-mode nil
+  "Enable helm completion."
+  :group 'helm)
+
 (defcustom helm-completing-read-handlers-alist
   '((describe-function . helm-completing-read-symbols)
     (describe-variable . helm-completing-read-symbols)
@@ -56,7 +60,7 @@ e.g ido completion for `find-file':
 same as
 \(find-file . ido-read-file-name\)
 Note that you don't need to enable `ido-mode' for this to work."
-  :group 'helm-files
+  :group 'helm-mode
   :type '(alist :key-type symbol :value-type symbol))
 
 
@@ -757,7 +761,7 @@ You can add such functions to `helm-completing-read-handlers-alist'
 with a nil value.
 
 Note: This mode will work only partially on Emacs23."
-  :group 'helm
+  :group 'helm-mode
   :global t
   :lighter helm-completion-mode-string
   (declare (special completing-read-function))