diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
index 23a361e97..226173ca6 100644
--- a/lib/Doctrine/ORM/Tools/SchemaTool.php
+++ b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -385,6 +385,12 @@ class SchemaTool
         }
 
         if (isset($mapping['options'])) {
+            if (isset($mapping['options']['comment'])) {
+                $options['comment'] = $mapping['options']['comment'];
+
+                unset($mapping['options']['comment']);
+            }
+
             $options['customSchemaOptions'] = $mapping['options'];
         }