diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index 3e76e8ac76..3e784c7a3b 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -517,6 +517,28 @@
     If address is an object in this case, the code given in "Before"
     works without changes.
 
+  * The following methods in `Form` are deprecated and will be removed in
+    Symfony 2.3:
+
+      * `getTypes`
+      * `getErrorBubbling`
+      * `getNormTransformers`
+      * `getClientTransformers`
+
+    You can access these methods on the `FormConfigInterface` object instead.
+
+    Before:
+
+    ```
+    $form->getErrorBubbling()
+    ```
+
+    After:
+
+    ```
+    $form->getConfig()->getErrorBubbling();
+    ```
+
 ### Validator
 
   * The methods `setMessage()`, `getMessageTemplate()` and
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index b78db354a4..2b1a6d32d4 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -73,3 +73,10 @@ CHANGELOG
  * added option "mapped" which should be used instead of setting "property_path" to false
  * "data_class" now *must* be set if a form maps to an object and should be left empty otherwise
  * improved error mapping on forms
+ * changed Form constructor to accept a single `FormConfigInterface` object
+ * changed argument order in the FormBuilder constructor
+ * deprecated Form methods
+   * `getTypes`
+   * `getErrorBubbling`
+   * `getNormTransformers`
+   * `getClientTransformers`