diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
index 68b3664887..eac705ae90 100644
--- a/CHANGELOG-2.0.md
+++ b/CHANGELOG-2.0.md
@@ -7,6 +7,44 @@ in 2.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1
 
+* 2.0.2 (2011-09-25)
+
+ * ae3aded: Added PCRE_DOTALL modifier to RouteCompiler to allow urlencoded linefeed in route parameters.
+ * e5a23db: [ClassLoader] added support for PHP 5.4 traits
+ * 11c4412: [DependencyInjection] fix 2219 IniFileLoader accept Boolean
+ * 64d44fb: [Translator] fixed recursion when using a fallback that is the same as the locale
+ * bca551e: [DomCrawler] ChoiceFormField should take the content when value is unavailable
+ * b635dca: [Translator] fixed non-loaded locale
+ * ab8e760: Fixed the creation of the subrequests
+ * 8e2cbe6: fixes usage of mb_*
+ * fd4d241: Profiler session import fixed.
+ * 9fb15c7: [Process] workaround a faulty implementation of is_executable on Windows
+ * 43b55ef: [Locale] Fix #2179 StubIntlDateFormatter support yy format
+ * 9ffd8ca: [Translation] renamed hasStrict() to defines()
+ * 79710ed: [Translation] added a MessageCatalogue::hasStrict() method to check if a string has a translation (but without taking into account the fallback mechanism)
+ * c50a3a1: [Translation] fixed transchoice when used with a fallback
+ * c985ffa: [Translation] fixed message selector when the message is empty (closes #2144)
+ * 27ba003: [HttpFoundation] changed the strategy introduced in a5ccda47b4406518ee75929ce2e690b6998c021b to fix functional tests and still allow to call save more than once for a Session
+ * ff99d80: Changed the behavior of Session::regenerate to destroy the session when it invalidates it.
+ * 73c8d2b: [Form] fixed error bubbling for Date and Time types when rendering as multiple choices (closes #2062)
+ * 95dc7e1: Fixed fourth argument of Filesystem->mirror()
+ * ae52303: [HttpFoundation] Fixed duplicate of request
+ * cd40ed4: Added missing method to HTTP Digest entry point
+ * 3a7e038: [FrameworkBundle] sanitize target arg in asset:install command
+ * 8d50c16: few optimisations for XliffFileLoader and XmlFileLoader
+ * 639513a: Per the documentation, the `NotBlank` constraint should be using the `empty` language construct, otherwise it will not trigger on, for example, a boolean false from an unchecked checkbox field.
+ * d19f1d7: [Doctrine] Fix UniqueEntityValidator reporting a false positive by ignoring multiple query results
+ * 0224a34: Fixes typo on ACL Doctrine cache.
+ * 6bd1749: Fixed a bug when multiple expanded choices would render unchecked because of the Form Framework's strict type checking.
+ * f448029: [HttpKernel] Tweaked SQLite to speed up SqliteProfilerStorage
+ * 2cfa22c: Fix Method ContainerAwareEventDispatcher::hasListeners
+ * f4c133e: removed trailing dot to make it consistent with other validator messages
+ * a6670c2: [Routing] fixed a caching issue when annotations are used on a base class used by more than one concrete class
+ * 946ccb6: [Routing] fixed annotation loaders for abstract classes, added more unit tests
+ * 723cb71: [Translation] Add compatibility to PCRE 6.6.0 for explicit interval pluralization
+ * 24bacdc: Ignore VCS files in assets:install command (closes #2025)
+ * 020fa51: [RedirectResponse] Added missing `doctype` and `title` tag
+
 * 2.0.1 (2011-08-26)
 
    * 1c7694f: [HttpFoundation] added a missing exception
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index a0e8de2505..b14720ae2e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -14,50 +14,58 @@ Symfony2 is the result of the work of many people who made the code better
  - Christophe Coevoet (stof)
  - Pascal Borreli (pborreli)
  - Joseph Bielawski (stloyd)
- - Igor Wiedler (igorw)
  - Benjamin Eberlei (beberlei)
+ - Alexandre Salomé (alexandresalome)
  - Lukas Kahwe Smith (lsmith77)
+ - Igor Wiedler (igorw)
  - Jonathan H. Wage (jwage)
- - Hugo Hamon (hhamon)
  - Jeremy Mikola (jmikola)
+ - Hugo Hamon (hhamon)
  - Thibault Duplessis (ornicar)
  - Bulat Shakirzyanov (avalanche123)
  - Eriksen Costa (eriksencosta)
+ - stealth35 (stealth35)
  - Francis Besset (francisbesset)
  - yethee (yethee)
  - Miha Vrhovnik (mvrhov)
- - Konstantin Kudryashov (everzet)
+ - Arnout Boks (aboks)
  - Martin Hasoň (hason)
  - Henrik Bjørnskov (henrikbjorn)
- - Lenar Lõhmus (lenar)
+ - Konstantin Kudryashov (everzet)
+ - Brikou CARRE (brikou)
+ - Jacob Dreesen (jdreesen)
  - Hidenori Goto (hidenorigoto)
+ - Lenar Lõhmus (lenar)
+ - Henrik Westphal (snc)
  - Brandon Turner (blt04)
  - Marc Weistroff (marcw)
  - John Wards (johnwards)
- - Arnout Boks (aboks)
  - Antoine Hérault (Herzult)
- - Brikou CARRE (brikou)
- - Alexandre Salomé (alexandresalome)
  - Daniel Holmes (danielholmes)
+ - Benjamin Dulau (benjamindulau)
  - Fabien Pennequin (FabienPennequin)
  - Matthieu Vachon (maoueh)
  - Katsuhiro OGAWA (fivestar)
- - stealth35 (stealth35)
+ - Konstantin Leboev (realmfoo)
+ - Christian Raue (craue)
  - Matthieu Bontemps (mbontemps)
+ - Wotre (Wotre)
+ - Michel Salib (michelsalib)
  - Robert Schönthal (digitalkaoz)
+ - Jordan Alliot (jalliot)
  - Michel Weimerskirch (mweimerskirch)
  - blue-eyes (blue-eyes)
  - Tim Nagel (merk)
  - Francois Zaninotto (fzaninotto)
+ - Excel Web Zone (excelwebzone)
  - Richard Shank (IamPersistent)
  - Amal Raghav (kertz)
- - Konstantin Leboev (realmfoo)
  - Jeroen Hoek (jdhoek)
- - Christian Raue (craue)
  - Arjen Brouwer (arjenjb)
+ - Thomas (rande)
  - Jakub Zalas (jakzal)
  - Artur Kotyrba (udat)
- - Jacob Dreesen (jdreesen)
+ - brki (brki)
  - Clément JOBEILI (dator)
  - Eric Clemmons (ericclemmons)
  - Xavier Montaña (xmontana)
@@ -65,37 +73,37 @@ Symfony2 is the result of the work of many people who made the code better
  - Martin Schuhfuss (usefulthink)
  - Dennis Benkert (denderello)
  - Dustin Whittle (dustinwhittle)
+ - Michele Orselli (micheleorselli)
  - Jean-François PHILIPPE (jfphilippe)
  - Justin Hileman (bobthecow)
+ - Alif Rachmawadi (alifity)
  - dlsniper (dlsniper)
  - Sven Paulus (subsven)
  - umpirsky (umpirsky)
  - Xavier Perez (DuoSRX)
  - Brouznouf (Brouznouf)
- - Henrik Westphal (snc)
  - Boussekeyt Jules (gordonslondon)
- - Thomas (rande)
+ - Helmer Aaviksoo (helmer)
  - Pablo Godel (pgodel)
  - Leszek Prabucki (l3l0)
- - Excel Web Zone (excelwebzone)
  - Jan Sorgalla (jsor)
  - Lee McDermott (lmcd)
  - HIROKI (hirocaster)
- - Michel Salib (michelsalib)
+ - Pierre-Yves LEBECQ (pylebecq)
  - Michael Ridgway (mridgway)
+ - Gordon Franke (gimler)
  - geoffrey
  - Matthew Lewinski (lewinski)
  - yktd26 (yktd26)
  - heccjj (heccjj)
  - Jeremie Augustin
+ - Tom Klingenberg (ktomk)
  - Aurelijus Valeiša (aurelijus)
  - Ray (rrehbeindoi)
- - Pierre-Yves LEBECQ (pylebecq)
+ - Kevin McBride (krmcbride)
  - Adrian Rudnik (kreischweide)
- - Gordon Franke (gimler)
  - asm89 (asm89)
  - Geoffrey Tran (geoffreytran)
- - Alif Rachmawadi (alifity)
  - Andréia Bohner (andreia)
  - Daniel Gomes (danielcsgomes)
  - Shigenobu Nishikawa (shishi)
@@ -103,17 +111,21 @@ Symfony2 is the result of the work of many people who made the code better
  - 77web (77web)
  - Greg Thornton (xdissent)
  - frost-nzcr4 (frost-nzcr4)
+ - Abhoryo (Abhoryo)
  - Donald Tyler (Chekote)
  - Kai
+ - patashnik (patashnik)
  - Gyula Sallai (thesalla)
  - Richard Miller (richardmiller)
  - Sergey Linnik (Partugal)
- - Kevin McBride (krmcbride)
  - Laszlo Korte (laszlokorte)
+ - Kirill chEbba Chebunin (chEbba)
  - Derek ROTH (DerekRoth)
+ - Baptiste Clavié (Taluu)
  - arnaud-lb (arnaud-lb)
  - Stepan Tanasiychuk (stfalcon)
  - Bertrand Zuchuat (Garfield-fr)
+ - Oncle Tom (oncletom)
  - Jan Behrens (deegital)
  - Jan Schumann (janschumann)
  - tero (tero)
@@ -133,16 +145,18 @@ Symfony2 is the result of the work of many people who made the code better
  - Cristian González Sánchez (cristiangsp)
  - Grégoire Passault (Gregwar)
  - Nils Adermann (naderman)
- - patashnik (patashnik)
  - Tobias Naumann (tna)
+ - Martin Mayer (martinmayer)
  - Steven Surowiec (steves)
- - Baptiste Clavié (Taluu)
  - Ivan Rey (ivanrey)
+ - Matthew Davis (mdavis1982)
  - Ned Schwartz (theinterned)
+ - Emil Einarsson (Einarsson)
  - Aurélien Fredouelle (AurelC2G)
- - Oncle Tom (oncletom)
+ - Grégoire Passault
  - Michael Roterman (wtfzdotnet)
  - Christian Schaefer (caefer)
+ - Teo (teo-sk)
  - Elliot Anderson (elliot)
  - Sortex
  - Tobias Sjösten (tobiassjosten)
@@ -152,6 +166,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Rostyslav Kinash
  - umpirski (umpirski)
  - Davide Borsatto (davideborsatto)
+ - Neil Katin
  - Sebastian Bergmann (sebastianbergmann)
  - Hossein Bukhamsin (husinluck)
  - Laurent Bachelier (laurentb)
@@ -169,25 +184,26 @@ Symfony2 is the result of the work of many people who made the code better
  - Guilherme Blanco (guilhermeblanco)
  - paulkamer (paulkamer)
  - Peter Kruithof (pkruithof)
+ - Stefano Sala (stewe)
  - Albert Jessurum (ajessu)
  - Gerard van Helden (drm)
- - Abhoryo (Abhoryo)
  - Fabian Vogler (fabian)
  - Cyril Quintin (cyqui)
  - kazusuke sasezaki (sasezaki)
- - Martin Mayer (martinmayer)
- - Emil Einarsson (Einarsson)
  - mwsaz
  - Gabriel Birke (gbirke)
  - Osman Üngür (import)
- - Matthew Davis (mdavis1982)
+ - Robert Campbell (jayrulez)
+ - Marek Kalnik (marekkalnik)
  - Don Pinkster
  - hlecorche
  - Vyacheslav Slinko
- - Grégoire Passault
+ - Luis Cordova (cordoval)
  - Daniel Cestari (dcestari)
  - Vladislav  (ideea)
- - Tom Klingenberg (ktomk)
+ - John Carr (Jc2k)
+ - jdewit (jdewit)
+ - Magnus Nordlander (magnusnordlander)
  - ouardisoft (ouardisoft)
  - Pierre Minnieur (pminnieur)
  - Benoît Merlet (trompette)
@@ -196,25 +212,28 @@ Symfony2 is the result of the work of many people who made the code better
  - Théophile Helleboid - chtitux (chtitux)
  - irmantas (irmantas)
  - chispita
- - Michele Orselli (micheleorselli)
  - Wojciech Sznapka (wowo)
+ - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Martijn Evers (martijn4evers)
  - Jeremy Bush (zombor)
  - kaiwa
  - Gustavo Adrian
  - Nicolas Fabre (nfabre)
- - Benjamin Dulau (benjamindulau)
  - Julien Brochet (aerialls)
  - Sebastian Utz (seut)
  - George Giannoulopoulos (dotoree)
  - Bart00 (Bart00)
+ - Alberto Pirovano (geezmo)
  - Jay Severson
+ - Evan Kaufman (EvanK)
  - meckhardt (meckhardt)
  - Joseph Rouff (rouffj)
  - Sebastian Ionescu
  - Dirk Pahl (dirkaholic)
  - Bouke Haarsma (Bouke)
+ - stloyd
+ - Luis Muñoz
  - Oleg Zinchenko (cystbear)
  - Benjamin Lévêque (benji07)
  - Sebastian Hörl (blogsh)
@@ -236,25 +255,27 @@ Symfony2 is the result of the work of many people who made the code better
  - Klaas Naaijkens
  - Masao Maeda (brtriver)
  - Gustavo Adrian (comfortablynumb)
+ - Denis Klementjev (dklementjev)
  - Kévin Dunglas (dunglas)
- - Robert Campbell (jayrulez)
  - Jimmy Leger (redpanda)
  - Tom Van Looy
  - Nicolas A. Bérard-Nault
  - Alexey Popkov
  - Adán Lobato (adanlobato)
  - chesteroni (chesteroni)
+ - Elnur Abdurrakhimov (elnur)
  - Beau Simensen (simensen)
  - Juan Ases García (Ases)
  - FabienD (FabienD)
  - Matt Drollette (MDrollette)
  - Skorney (Skorney)
+ - Vincent (Vincent-P)
  - Sébastien HOUZE
  - Sergiy Sokolenko
  - Vladimir Sazhin (cannie)
  - catchamonkey (catchamonkey)
  - Christian Stocker (chregu)
- - Luis Cordova (cordoval)
+ - chx (chx)
  - Damien Alexandre (damienalexandre)
  - Damon Jones (damonjones)
  - Djama Suemenich (djama)
@@ -279,3 +300,4 @@ Symfony2 is the result of the work of many people who made the code better
  - Marcel Beerta (mazen)
  - Nicolas de Marqué Fromentin (nicodmf)
  - Pierre (ptheg)
+ - William DURAND (willdurand)
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index fa3105539e..013baf9bfb 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -57,7 +57,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.1.0-DEV';
+    const VERSION = '2.0.3-DEV';
 
     /**
      * Constructor.
diff --git a/vendors.php b/vendors.php
index 3709000eaf..4a329d5358 100755
--- a/vendors.php
+++ b/vendors.php
@@ -24,9 +24,9 @@ if (!is_dir($vendorDir = dirname(__FILE__).'/vendor')) {
 }
 
 $deps = array(
-    array('doctrine', 'http://github.com/doctrine/doctrine2.git', 'origin/2.1.x'),
-    array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', 'origin/2.1.x'),
-    array('doctrine-common', 'http://github.com/doctrine/common.git', 'origin/2.1.x'),
+    array('doctrine', 'http://github.com/doctrine/doctrine2.git', '2.1.1'),
+    array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', '2.1.2'),
+    array('doctrine-common', 'http://github.com/doctrine/common.git', '2.1.1'),
     array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.1'),
     array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'v4.1.2'),
     array('twig', 'http://github.com/fabpot/Twig.git', 'v1.2.0'),