diff --git a/cdist/conf/type/__user/man.text b/cdist/conf/type/__user/man.text
index 7be2c2f2..9db4a9f0 100644
--- a/cdist/conf/type/__user/man.text
+++ b/cdist/conf/type/__user/man.text
@@ -26,8 +26,6 @@ home::
    see above
 gid::
    see above
-groups::
-   see above
 password::
    see above
 shell::
diff --git a/cdist/conf/type/__user/parameter/optional b/cdist/conf/type/__user/parameter/optional
index fe02e227..e3cf52d5 100644
--- a/cdist/conf/type/__user/parameter/optional
+++ b/cdist/conf/type/__user/parameter/optional
@@ -1,7 +1,6 @@
 comment
 home
 gid
-groups
 password
 shell
 uid
diff --git a/docs/changelog b/docs/changelog
index b1cf62ff..68b35eac 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -8,6 +8,7 @@ next:
 	* Core: Ensure global and type explorers are executable
 	* Type __rvm_gemset: Change parameter "default" to be boolean
 	* New Type: __user_groups (Steven Armstrong)
+	* Type __user: Remove --groups support (now provided by __user_groups)
 
 2.1.0pre8: 2012-11-15
 	* Type cleanup: __apt_ppa, __apt_ppa_update_index, __file, 
diff --git a/docs/web/cdist/update.mdwn b/docs/web/cdist/update.mdwn
index 2316cf68..22b92769 100644
--- a/docs/web/cdist/update.mdwn
+++ b/docs/web/cdist/update.mdwn
@@ -41,6 +41,7 @@ To upgrade to the lastet version do
    Support for the variable **\_\_object_name** is already present in 2.0.
  * The types **\_\_autofs**, **\_\_autofs_map** and **\_\_autofs_reload** have been removed
    (no maintainer, no users)
+ * Type **\_\_user**: Parameter --groups removed (use the new \_\_user_groups type)
 
 ### Updating from 1.7 to 2.0