diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index a33c19b6b..8f61920c1 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -191,6 +191,12 @@ class YamlDriver extends AbstractFileDriver
                 // Check for SequenceGenerator/TableGenerator definition
                 if (isset($idElement['sequenceGenerator'])) {
                     $metadata->setSequenceGeneratorDefinition($idElement['sequenceGenerator']);
+                } else if (isset($idElement['customIdGenerator'])) {
+                $customGenerator = $idElement['customIdGenerator'];
+                $metadata->setCustomGeneratorDefinition(array(
+                    'class' => (string) $customGenerator['class'],
+                    'args' => $customGenerator['args']
+                ));
                 } else if (isset($idElement['tableGenerator'])) {
                     throw MappingException::tableIdGeneratorNotImplemented($className);
                 }
diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.Animal.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.Animal.dcm.yml
index cd6ec292c..4f01be63b 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.Animal.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.Animal.dcm.yml
@@ -3,4 +3,12 @@ Doctrine\Tests\ORM\Mapping\Animal:
   inheritanceType: SINGLE_TABLE
   discriminatorMap:
     cat: Cat
-    dog: Dog
\ No newline at end of file
+    dog: Dog
+  id:
+    id:
+      type: integer
+      generator:
+        strategy: CUSTOM
+      customIdGenerator:
+        class: stdClass
+        args: [ par1, par2 ]
\ No newline at end of file