diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
index 29b73c2b4af..6ef60af7bb9 100644
--- a/reference/forms/types/entity.rst
+++ b/reference/forms/types/entity.rst
@@ -13,6 +13,7 @@ objects from the database.
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)     |
 +-------------+------------------------------------------------------------------+
 | Options     | - `class`_                                                       |
+|             | - `data_class`_                                                  |
 |             | - `property`_                                                    |
 |             | - `group_by`_                                                    |
 |             | - `query_builder`_                                               |
@@ -103,6 +104,8 @@ The class of your entity (e.g. ``AcmeStoreBundle:Category``). This can be
 a fully-qualified class name (e.g. ``Acme\StoreBundle\Entity\Category``)
 or the short alias name (as shown prior).
 
+.. include:: /reference/forms/types/options/data_class.rst.inc
+
 property
 ~~~~~~~~
 
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
index b51fe597078..1628c93fc2f 100644
--- a/reference/forms/types/form.rst
+++ b/reference/forms/types/form.rst
@@ -11,6 +11,8 @@ on all fields.
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
+.. include:: /reference/forms/types/options/data_class.rst.inc
+
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/constraints.rst.inc
diff --git a/reference/forms/types/options/data_class.rst.inc b/reference/forms/types/options/data_class.rst.inc
new file mode 100644
index 00000000000..3636dbf13d6
--- /dev/null
+++ b/reference/forms/types/options/data_class.rst.inc
@@ -0,0 +1,14 @@
+.. versionadded:: 2.4
+    The ``data_class`` option was introduced in Symfony 2.4.
+
+data_class
+~~~~~~~~~~
+
+**type**: ``string``
+
+This option is used to set the appropriate data mapper to be used by the form,
+so you can use it for any form field type which requires an object.
+
+    $builder->add('media', 'sonata_media_type', array(
+        'data_class' => 'Acme\DemoBundle\Entity\Media',
+    ));