diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index cdb7e81a73..a5eb385a57 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -748,6 +748,9 @@
       * `removeChild`: `remove`
       * `hasChild`: `has`
 
+    The new method `addVars` was added to make the definition of multiple
+    variables at once more convenient.
+
     The method `hasChildren` was deprecated. You should use `count` instead.
 
     Before:
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index 678ee4068a..3feb6bd3ad 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -35,7 +35,7 @@ class CheckboxType extends AbstractType
      */
     public function buildView(FormViewInterface $view, FormInterface $form, array $options)
     {
-        $view->setVars(array(
+        $view->addVars(array(
             'value'   => $options['value'],
             'checked' => null !== $form->getViewData(),
         ));
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index d6846210b5..d5a3adaf84 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -75,7 +75,7 @@ class ChoiceType extends AbstractType
      */
     public function buildView(FormViewInterface $view, FormInterface $form, array $options)
     {
-        $view->setVars(array(
+        $view->addVars(array(
             'multiple'          => $options['multiple'],
             'expanded'          => $options['expanded'],
             'preferred_choices' => $options['choice_list']->getPreferredViews(),
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
index 006b0c249a..6b0d1ec1ee 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -48,7 +48,7 @@ class CollectionType extends AbstractType
      */
     public function buildView(FormViewInterface $view, FormInterface $form, array $options)
     {
-        $view->setVars(array(
+        $view->addVars(array(
             'allow_add'    => $options['allow_add'],
             'allow_delete' => $options['allow_delete'],
         ));
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 69926fb698..373c5fcdbc 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -23,7 +23,7 @@ class FileType extends AbstractType
      */
     public function buildView(FormViewInterface $view, FormInterface $form, array $options)
     {
-        $view->setVars(array(
+        $view->addVars(array(
             'type'  => 'file',
             'value' => '',
         ));
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index b5e57c51d7..292dcb094a 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -89,7 +89,7 @@ class FormType extends AbstractType
             $types[] = $type->getName();
         }
 
-        $view->setVars(array(
+        $view->addVars(array(
             'form'               => $view,
             'id'                 => $id,
             'name'               => $name,
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 02bdca38c1..b8925be2f9 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -115,7 +115,7 @@ class TimeType extends AbstractType
      */
     public function buildView(FormViewInterface $view, FormInterface $form, array $options)
     {
-        $view->setVars(array(
+        $view->addVars(array(
             'widget'       => $options['widget'],
             'with_seconds' => $options['with_seconds'],
         ));
diff --git a/src/Symfony/Component/Form/FormView.php b/src/Symfony/Component/Form/FormView.php
index a20b847954..ad0ac4d2b2 100644
--- a/src/Symfony/Component/Form/FormView.php
+++ b/src/Symfony/Component/Form/FormView.php
@@ -84,7 +84,7 @@ class FormView implements \IteratorAggregate, FormViewInterface
     /**
      * {@inheritdoc}
      */
-    public function setVars(array $vars)
+    public function addVars(array $vars)
     {
         $this->vars = array_replace($this->vars, $vars);
 
diff --git a/src/Symfony/Component/Form/FormViewInterface.php b/src/Symfony/Component/Form/FormViewInterface.php
index 1431b6a9f4..1e71aba064 100644
--- a/src/Symfony/Component/Form/FormViewInterface.php
+++ b/src/Symfony/Component/Form/FormViewInterface.php
@@ -114,13 +114,13 @@ interface FormViewInterface extends \ArrayAccess, \Traversable, \Countable
     function setVar($name, $value);
 
     /**
-     * Sets a list of view variables.
+     * Adds a list of view variables.
      *
      * @param array $values An array of variable names and values.
      *
      * @return FormViewInterface The view object.
      */
-    function setVars(array $values);
+    function addVars(array $values);
 
     /**
      * Returns whether a view variable exists.