diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index 2190ccdc10..337f8be0d1 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -227,7 +227,7 @@ class DoctrineExtension extends Extension
                 $container->setParameter('doctrine.orm.'.$key, $config[$key]);
             }
         }
-        $container->setParameter('doctrine.orm.metadata_driver.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata', $container));
+        $container->setParameter('doctrine.orm.metadata_driver.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata/orm', $container));
         $container->setParameter('doctrine.orm.metadata_driver.entity_dirs', $this->findBundleSubpaths('Entity', $container));
     }
 
@@ -487,9 +487,9 @@ class DoctrineExtension extends Extension
         }
         $container->addResource(new FileResource($resource));
 
-        if (count(glob($dir.'/Resources/config/doctrine/metadata/*.xml'))) {
+        if (count(glob($dir.'/Resources/config/doctrine/metadata/orm/*.xml'))) {
             return 'xml';
-        } elseif (count(glob($dir.'/Resources/config/doctrine/metadata/*.yml'))) {
+        } elseif (count(glob($dir.'/Resources/config/doctrine/metadata/orm/*.yml'))) {
             return 'yml';
         }
 
@@ -532,4 +532,4 @@ class DoctrineExtension extends Extension
     {
         return 'doctrine';
     }
-}
\ No newline at end of file
+}