diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index aa909f5..7ac4988 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -474,6 +474,29 @@
     <Bundle name="python-netifaces"/>
   </Group>
 
+  <Group name="crans-nfs">
+    <Group name="crans"/>
+    <Group name="ssh"/>
+    <Group name="sudo"/>
+    <Group name="mail"/>
+    <Group name="apt"/>
+    <Group name="bcfg2-client"/>
+    <Group name="backup-client"/>
+    <Group name="rsyslog-client"/>
+    <Group name="iscsi"/>
+    <Group name="nslcd"/>
+
+    <Bundle name="apt"/>
+    <Bundle name="apt-keys"/>
+    <Bundle name="ntp"/>
+    <Bundle name="nagios"/>
+    <Bundle name="molly-guard"/>
+
+    <Bundle name="nfs-server"/>
+    <Bundle name="quota"/>
+    <Bundle name="generate"/>
+  </Group>
+
   <Group name="crans-etch" public="true"
      comment="profile minimal pour etch">
     <Group name="crans-common"/>
@@ -543,51 +566,13 @@
   </Group>
 
   <Group name="crans-nfs-squeeze">
-    <Group name="crans"/>
     <Group name="crans-nfs"/>
-    <Group name="ssh"/>
-    <Group name="sudo"/>
     <Group name="squeeze"/>
-    <Group name="mail"/>
-    <Group name="apt"/>
-    <Group name="bcfg2-client"/>
-    <Group name="backup-client"/>
-    <Group name="rsyslog-client"/>
-    <Group name="iscsi"/>
-    <Group name="nslcd"/>
-
-    <Bundle name="apt"/>
-    <Bundle name="apt-keys"/>
-    <Bundle name="ntp"/>
-    <Bundle name="nagios"/>
-    <Bundle name="molly-guard"/>
-
-    <Bundle name="nfs-server"/>
-    <Bundle name="quota"/>
   </Group>
 
   <Group name="crans-nfs-wheezy">
-    <Group name="crans"/>
     <Group name="crans-nfs"/>
-    <Group name="ssh"/>
-    <Group name="sudo"/>
     <Group name="wheezy"/>
-    <Group name="mail"/>
-    <Group name="apt"/>
-    <Group name="bcfg2-client"/>
-    <Group name="backup-client"/>
-    <Group name="rsyslog-client"/>
-    <Group name="iscsi"/>
-    <Group name="nslcd"/>
-
-    <Bundle name="apt"/>
-    <Bundle name="apt-keys"/>
-    <Bundle name="ntp"/>
-    <Bundle name="nagios"/>
-    <Bundle name="molly-guard"/>
-
-    <Bundle name="nfs-server"/>
-    <Bundle name="quota"/>
   </Group>
 
   <!-- +=============================+ -->