diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
index c5977eb88..cdca27e3b 100644
--- a/lib/Doctrine/ORM/Tools/EntityGenerator.php
+++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -164,6 +164,7 @@ class EntityGenerator
         Type::TEXT          => 'string',
         Type::BLOB          => 'string',
         Type::DECIMAL       => 'string',
+        Type::GUID          => 'string',
         Type::JSON_ARRAY    => 'array',
         Type::SIMPLE_ARRAY  => 'array',
         Type::BOOLEAN       => 'bool',
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index 8f6c35a52..438cf9323 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -1084,6 +1084,14 @@ class EntityGeneratorTest extends OrmTestCase
                 'value' => 'blob'
                 ]
             ],
+            [
+                [
+                    'fieldName' => 'guid',
+                    'phpType' => 'string',
+                    'dbType' => 'guid',
+                    'value' => '00000000-0000-0000-0000-000000000001'
+                ]
+            ],
             [
                 [
                 'fieldName' => 'decimal',