diff --git a/lib/Doctrine/MappingException.php b/lib/Doctrine/ORM/Exceptions/MappingException.php
similarity index 97%
rename from lib/Doctrine/MappingException.php
rename to lib/Doctrine/ORM/Exceptions/MappingException.php
index 02d54a5a9..39ec1d22f 100644
--- a/lib/Doctrine/MappingException.php
+++ b/lib/Doctrine/ORM/Exceptions/MappingException.php
@@ -26,7 +26,7 @@
  *
  * @since 2.0
  */
-class Doctrine_MappingException extends Doctrine_Exception
+class Doctrine_ORM_Exceptions_MappingException extends Doctrine_ORM_Exceptions_ORMException
 {
     public static function identifierRequired($entityName)
     {