diff --git a/Bundler/git.xml b/Bundler/git.xml
new file mode 100644
index 0000000..4c5cec7
--- /dev/null
+++ b/Bundler/git.xml
@@ -0,0 +1,3 @@
+<Bundle name="git" version="2">
+    <Package name="git"/>
+</Bundle>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index d50ce52..5ea1bb5 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -32,15 +32,14 @@
     <Group name="https_cert" />
   </Group>
 
-  <Group name="daath"
-     profile="true">
-    <Group name="crans-nfs-squeeze"/>
-    <Group name="non-vlan-adherent"/>
-  </Group>
-
   <Group name="zbee"
      profile="true">
     <Group name="crans-nfs-wheezy"/>
+    <Group name="non-vlan-adherent"/>
+  </Group>
+
+  <Group name="kdell" profile="true">
+    <Group name="crans-wheezy"/>
   </Group>
 
   <Group name="sable"
@@ -305,12 +304,6 @@
     <Group name="https_cert" />
   </Group>
 
-  <Group name="munin"
-         profile="true">
-    <Group name="crans-domu-squeeze"/>
-    <Group name="munin-server"/>
-  </Group>
-
   <Group name="install-party"
          profile="true">
     <Group name="crans-domu-squeeze"/>
@@ -405,6 +398,8 @@
 
     <Bundle name="knownhosts"/>
     <Bundle name="secrets"/>
+    <Bundle name="nfs-client"/>
+    <Bundle name="git"/>
   </Group>
 
   <Group name="crans-common"