diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
index e2bc703b5c..e983df1800 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -59,6 +59,11 @@ class WebProfilerExtension extends Extension
                 $container->setParameter('debug.toolbar.intercept_redirects', (Boolean) $config[$key]);
             }
         }
+
+        if (isset($config['templates']) && $container->hasParameter('data_collector.templates')) {
+            $templates = array_merge($container->getParameter('data_collector.templates'), $config['templates']);
+            $container->setParameter('data_collector.templates', $templates);
+        }
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
index 63c50ae5d1..d16f52db7a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/schema/webprofiler-1.0.xsd
@@ -8,7 +8,14 @@
     <xsd:element name="config" type="config" />
 
     <xsd:complexType name="config">
+        <xsd:sequence>
+            <xsd:element name="templates" type="templates" minOccurs="0" maxOccurs="1" />
+        </xsd:sequence>
         <xsd:attribute name="toolbar" type="xsd:boolean" />
         <xsd:attribute name="intercept-redirects" type="xsd:boolean" />
     </xsd:complexType>
+
+    <xsd:complexType name="templates">
+        <xsd:anyAttribute processContents="lax" />
+    </xsd:complexType>
 </xsd:schema>