diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
index 4fb5b0d3bf..c5187f3b91 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -87,6 +87,7 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
         $def->setConfigurator($parentDef->getConfigurator());
         $def->setFile($parentDef->getFile());
         $def->setPublic($parentDef->isPublic());
+        $def->setLazy($parentDef->isLazy());
 
         // overwrite with values specified in the decorator
         $changes = $definition->getChanges();
@@ -111,6 +112,9 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
         if (isset($changes['public'])) {
             $def->setPublic($definition->isPublic());
         }
+        if (isset($changes['lazy'])){
+            $def->setLazy($definition->isLazy());
+        }
 
         // merge arguments
         foreach ($definition->getArguments() as $k => $v) {
diff --git a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
index ad3c3c1dd0..1f72b8f16b 100644
--- a/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
+++ b/src/Symfony/Component/DependencyInjection/DefinitionDecorator.php
@@ -149,6 +149,18 @@ class DefinitionDecorator extends Definition
         return parent::setPublic($boolean);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @api
+     */
+    public function setLazy($boolean)
+    {
+        $this->changes['lazy'] = true;
+
+        return parent::setLazy($boolean);
+    }
+
     /**
      * Gets an argument to pass to the service constructor/factory method.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
index f3c5b1544d..98e0c871e0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -143,6 +143,36 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo', $def->getClass());
     }
 
+    public function testSetLazyOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent','stdClass');
+
+        $container->setDefinition('child1',new DefinitionDecorator('parent'))
+            ->setLazy(true)
+        ;
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
+    public function testSetLazyOnServiceIsParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent','stdClass')
+            ->setLazy(true)
+        ;
+
+        $container->setDefinition('child1',new DefinitionDecorator('parent'));
+
+        $this->process($container);
+
+        $this->assertTrue($container->getDefinition('child1')->isLazy());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
index bf1bab1e29..8be8b64230 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
@@ -61,6 +61,16 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('public' => true), $def->getChanges());
     }
 
+    public function testSetLazy()
+    {
+        $def = new DefinitionDecorator('foo');
+
+        $this->assertFalse($def->isLazy());
+        $this->assertSame($def, $def->setLazy(false));
+        $this->assertFalse($def->isLazy());
+        $this->assertEquals(array('lazy' => true), $def->getChanges());
+    }
+
     public function testSetArgument()
     {
         $def = new DefinitionDecorator('foo');