diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index 49e966ef65..1b93282623 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -30,5 +30,13 @@ class ExtensionPass implements CompilerPassInterface
         if ($container->has('translator')) {
             $container->getDefinition('twig.extension.trans')->addTag('twig.extension');
         }
+
+        if ($container->has('router')) {
+            $container->getDefinition('twig.extension.routing')->addTag('twig.extension');
+        }
+
+        if ($container->has('fragment.handler')) {
+            $container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 5dbeef7e2f..971f4f17eb 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -79,7 +79,6 @@
         </service>
 
         <service id="twig.extension.routing" class="%twig.extension.routing.class%" public="false">
-            <tag name="twig.extension" />
             <argument type="service" id="router" />
         </service>
 
@@ -88,7 +87,6 @@
         </service>
 
         <service id="twig.extension.httpkernel" class="%twig.extension.httpkernel.class%" public="false">
-            <tag name="twig.extension" />
             <argument type="service" id="fragment.handler" />
         </service>