diff --git a/Cfg/etc/xen/puppet/puppet b/Cfg/etc/xen/puppet/puppet
new file mode 100644
index 0000000..b747f3a
--- /dev/null
+++ b/Cfg/etc/xen/puppet/puppet
@@ -0,0 +1,13 @@
+# -*- coding: utf-8; mode: python -*-
+
+execfile("/etc/xen/common_squeeze.py")
+
+name = "puppet"
+
+disk = [ vol(name, "slash", "xvda"),
+         vol(name, "var", "xvdb"),
+         vol(name, "swap", "xvdc") ]
+
+
+vif = [ #pub('02:8c:42:42:67:4b'),
+        adm('02:8c:42:42:67:4c') ]
diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index f202bdc..2023d9f 100644
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -48,6 +48,7 @@
   <Client name="dhcp.adm.crans.org" profile="dhcp"/>
   <Client name="log.adm.crans.org" profile="log"/>
   <Client name="routeur.adm.crans.org" profile="routeur"/>
+  <Client name="puppet.adm.crans.org" profile="puppet" pingable="Y"/>
 
   <!-- Containers OpenVZ -->
   <Client name="notyetbroken.adm.crans.org" profile="notyetbroken" pingable="N" pingtime="1252769390.14"/>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 098686f..18c9037 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -409,6 +409,12 @@
     <Group name="dnssec-validation"/>
   </Group>
 
+  <Group name="puppet"
+        profile="true">
+    <Group name="adm-only" />
+    <Group name="crans-squeeze"/>
+    <Group name="domu"/>
+  </Group>
   <!-- profile de test -->
 
   <Group name="bcfg2tmp0" profile="true">