diff --git a/Base/needed.xml b/Base/needed.xml
index 3048ce0..0bce7d1 100644
--- a/Base/needed.xml
+++ b/Base/needed.xml
@@ -51,12 +51,14 @@
     <ConfigFile name="/etc/sysctl.conf"/>
   </Group>
 
-  <Group name="nfs">
-    <!-- fping est necessaire pour le script attendre-vert -->
-    <Package name="fping"/>
+  <Group name="crans-nfs-squeeze">
+    <Package name="nfs-kernel-server"/>
+    <Package name="quota"/>
+    <ConfigFile name="/etc/default/nfs-kernel-server"/>
+    <ConfigFile name="/etc/default/quota"/>
   </Group>
 
-  <Group name="dom0">
+  <Group name="iscsi">
     <Package name="open-iscsi"/>
     <ConfigFile name="/etc/udev/rules.d/10_crans_iscsi.rules"/>
   </Group>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 3ed8d2e..219d161 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -39,6 +39,7 @@
   <Group name="daath"
      profile="true">
     <Group name="crans-squeeze"/>
+    <Group name="adm-only"/>
   </Group>
 
   <Group name="sable"
@@ -459,8 +460,9 @@
   <Group name="crans-dom0-squeeze" public="true"
          comment="groupe crans pour un dom0 sous squeeze">
     <Group name="crans"/>
-    <Group name="dom0"/>
-
+    <Group name="dom0" />
+    <Group name="iscsi"/>
+    <Group name="rsyslog-client"/>
     <Group name="squeeze"/>
 
     <Group name="mail"/>
@@ -476,6 +478,26 @@
     <Bundle name="nagios"/>
   </Group>
 
+  <Group name="crans-nfs-squeeze">
+    <Group name="crans"/>
+    <Group name="ssh"/>
+    <Group name="sudo"/>
+    <Group name="squeeze"/>
+    <Group name="mail"/>
+    <Group name="apt"/>
+    <Group name="secrets"/>
+    <Group name="bcfg2-client"/>
+    <Group name="backup-client"/>
+    <Group name="rsyslog-client"/>
+    <Group name="iscsi"/>
+
+    <Bundle name="apt"/>
+    <Bundle name="apt-keys"/>
+    <Bundle name="ntp"/>
+    <Bundle name="nagios"/>
+    <Bundle name="molly-guard"/>
+  </Group>
+
   <!-- +=============================+ -->
   <!-- | Composantes du groupe crans | -->
   <!-- +=============================+ -->
diff --git a/Python/etc/fstab b/Python/etc/fstab
index 9a62a41..aed3b75 100644
--- a/Python/etc/fstab
+++ b/Python/etc/fstab
@@ -17,7 +17,7 @@ print metadata.Probes["fstab_local"]
 
 if has("nfs"):
     @# Le nfs
-    mnt("fx.adm.crans.org:/usr/scripts", "/usr/scripts", "nfs", ["rw"])
+    mnt("daath.adm.crans.org:/usr/scripts", "/usr/scripts", "nfs", ["rw"])
     if has("home-permanent"):
         # Pour ceux qui accèdent beaucoup aux homes on monte tout le /home
         mnt("fx.adm.crans.org:/home-adh", "/home", "nfs", ["rw"]);