diff --git a/src/Symfony/Foundation/Bundle/KernelBundle.php b/src/Symfony/Foundation/Bundle/KernelBundle.php
index d10e0ed84e..59a4069a99 100644
--- a/src/Symfony/Foundation/Bundle/KernelBundle.php
+++ b/src/Symfony/Foundation/Bundle/KernelBundle.php
@@ -37,6 +37,7 @@ class KernelBundle extends Bundle
 
     if ($container->getParameter('kernel.debug'))
     {
+      $configuration->merge($loader->load('debug.xml'));
       $configuration->setDefinition('event_dispatcher', $configuration->findDefinition('debug.event_dispatcher'));
     }
 
diff --git a/src/Symfony/Foundation/Resources/config/services.xml b/src/Symfony/Foundation/Resources/config/services.xml
index 659cb1cf1f..422c59d58e 100644
--- a/src/Symfony/Foundation/Resources/config/services.xml
+++ b/src/Symfony/Foundation/Resources/config/services.xml
@@ -6,7 +6,6 @@
 
   <parameters>
     <parameter key="event_dispatcher.class">Symfony\Foundation\EventDispatcher</parameter>
-    <parameter key="debug.event_dispatcher.class">Symfony\Foundation\Debug\EventDispatcher</parameter>
     <parameter key="request_handler.class">Symfony\Components\RequestHandler\RequestHandler</parameter>
     <parameter key="request.class">Symfony\Components\RequestHandler\Request</parameter>
     <parameter key="response.class">Symfony\Components\RequestHandler\Response</parameter>
@@ -19,11 +18,6 @@
       <argument type="service" id="service_container" />
     </service>
 
-    <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%">
-      <argument type="service" id="service_container" />
-      <argument type="service" id="logger" on-invalid="null" />
-    </service>
-
     <service id="error_handler" class="%error_handler.class%">
       <argument>%error_handler.level%</argument>
       <call method="register" />
diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php
index 4fafc9da4f..55c9a70c6f 100644
--- a/src/Symfony/Foundation/bootstrap.php
+++ b/src/Symfony/Foundation/bootstrap.php
@@ -59,6 +59,7 @@ class KernelBundle extends Bundle
 
     if ($container->getParameter('kernel.debug'))
     {
+      $configuration->merge($loader->load('debug.xml'));
       $configuration->setDefinition('event_dispatcher', $configuration->findDefinition('debug.event_dispatcher'));
     }