diff --git a/Bundler/isc-dhcp-server.xml b/Bundler/isc-dhcp-server.xml
index 2c8d90d..74eb6b0 100644
--- a/Bundler/isc-dhcp-server.xml
+++ b/Bundler/isc-dhcp-server.xml
@@ -1,13 +1,10 @@
 <Bundle name="isc-dhcp-server">
     <Package name="isc-dhcp-server"/>
-    <Package name="bind9utils"/>
     <Service name="isc-dhcp-server"/>
     <Path type="directory" name="/etc/dhcp3/generated"/>
     <Path type="symlink" name="/etc/dhcp"/>
     <Python name="/etc/dhcp3/dhcpd.conf"/>
     <Python name="/etc/dhcp3/omapi.conf"/>
     <Python name="/etc/dhcp3/dhcp-failover.conf"/>
-    <Path name="/etc/dhcp3/omapi_generate"/>
-    <Action name="omapi_key"/>
 <!-- Conf générée par generate -->
 </Bundle>
diff --git a/Bundler/secrets.xml b/Bundler/secrets.xml
index 84d1071..c41f0c3 100644
--- a/Bundler/secrets.xml
+++ b/Bundler/secrets.xml
@@ -10,6 +10,7 @@
      </Group>
      <Python name="/etc/crans/secrets/slon.py"/>
      <Python name="/etc/crans/secrets/nols.py"/>
+     <Python name="/etc/crans/secrets/dhcp.py"/>
      <Python name="/etc/crans/secrets/README"/>
      <!-- Il faut penser au setfacl sur le serveur de l'intranet2 (o2) -->
      <Group name="intranet2-server">
diff --git a/Python/etc/crans/secrets/dhcp.py b/Python/etc/crans/secrets/dhcp.py
new file mode 100644
index 0000000..cd4571f
--- /dev/null
+++ b/Python/etc/crans/secrets/dhcp.py
@@ -0,0 +1,6 @@
+info["perms"] = 0440
+info["group"] = "adm"
+import dhcp
+
+print "dhcp_omapi_keyname = '%s'" % dhcp.dhcp_omapi_keyname
+print "dhcp_omapi_keys = %s" % dhcp.dhcp_omapi_keys
diff --git a/Python/etc/dhcp3/omapi.conf b/Python/etc/dhcp3/omapi.conf
index b82537a..928d8d5 100644
--- a/Python/etc/dhcp3/omapi.conf
+++ b/Python/etc/dhcp3/omapi.conf
@@ -8,7 +8,17 @@ comment_start = "#"
 
 header("Configuration pour omapi pour %s" % admhostname)
 
-include("secrets")
+import dhcp
+import os
+import base64
+
+if not dhcp.dhcp_omapi_keys.get(admhostname, False):
+    host = admhostname
+    key = base64.encodestring(os.urandom(64)).replace('\n','')
+    with open('/etc/crans/secrets/dhcp/dhcp.key', 'a+') as f:
+        f.write("%s %s\n" % (host, key))
+        f.close()
+    reload(dhcp)
 
 print """
 omapi-port 9991;
@@ -18,4 +28,4 @@ key omapi_key {
 };
 
 omapi-key omapi_key;
-""" % secrets.dhcp_omapi_keys.get(admhostname, '')
+""" % dhcp.dhcp_omapi_keys.get(admhostname, '')
diff --git a/Rules/isc-dhcp-server.xml b/Rules/isc-dhcp-server.xml
index eb4c012..29c4256 100644
--- a/Rules/isc-dhcp-server.xml
+++ b/Rules/isc-dhcp-server.xml
@@ -6,6 +6,5 @@
     <Path type="directory" name="/etc/dhcp3/dhclient-enter-hooks.d/" perms="0755" owner="root" group="root"/>
     <Path type="directory" name="/etc/dhcp3/dhclient-exit-hooks.d/" perms="0755" owner="root" group="root"/>
     <Path type="symlink" name="/etc/dhcp" to="/etc/dhcp3"/>
-    <Action name="omapi_key" timing="post" status="check" when="always" command="/etc/dhcp3/omapi_generate"/>
   </Group>
 </Rules>