diff --git a/ChangeLog b/ChangeLog
index 232a08724617ad242d8a51cfe613413d507af97e..ede1c36412c5544acaf220c42247ea53cfbf5e0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2014-04-16 6561e92 [RELEASE] Release of TYPO3 6.2.1 (TYPO3 Release Team)
+2014-04-16 0d82969 #57354 [TASK] Release file and folder permission check (Markus Hoelzle)
+2014-04-16 977f772 #57681 [BUGFIX] ResourceStorage does not sanitize folder/file name (Frans Saris)
+2014-04-16 88f7216 #57957 [BUGFIX] DBAL sql_fetch_* must return boolean or array (Jigal van Hemert)
+2014-04-16 395b454 #39035 [BUGFIX] TCA tree fail to load with IRRE (Xavier Perseguers)
+2014-04-16 5fb9885 #57750 [BUGFIX] Set maxLevels of generated sys_category TCA (Frans Saris)
+2014-04-15 05eb1f2 #33499 [BUGFIX] Follow-up to l10n_mode=exclude for record titles (Christian Kuhn)
+2014-04-15 a7d1f8c #57497 [BUGFIX] TceformsUpdateWizard shows up too often (Markus Klein)
+2014-04-15 f8896e1 #33499 [BUGFIX] BE ignores l10n_mode for record titles (Markus Klein)
+2014-04-15 f218040 #57942 [FEATURE] Provide API to add cached TCA changes (Helmut Hummel)
+2014-04-15 ea063ac #57949 [CLEANUP] Category related tests cleanup (Helmut Hummel)
+2014-04-15 d55da66 Revert "[BUGFIX] Make category TCA changes cacheable" (Helmut Hummel)
+2014-04-15 2b4aeef #57881 [BUGFIX] Make category TCA changes cacheable (Helmut Hummel)
+2014-04-15 344c6cc #55314 [TASK] Remove hardcoded module name in AbstractDatabaseRecordList (Marcin SÄ…gol)
+2014-04-15 b97dc01 #57871 [CLEANUP] Clean up comments and error messages in ResourceStorage (Oliver Klee)
+2014-04-15 1484cef #51768 [TASK] Updates prototype and scriptaculous, fixing IE9+ issues (Ernesto Baschny)
+2014-04-15 0f8a687 #57921 [CLEANUP] Remove unused [BE][usePHPFileFunctions] option (Markus Klein)
+2014-04-15 ee766f6 #57920 [BUGFIX] Do not unset() PageRenderer class members (Markus Klein)
+2014-04-14 8dc34a9 #57863 [FEATURE] Introduce signal in loadBaseTca (Helmut Hummel)
+2014-04-14 dddfa92 #57579 [BUGFIX] Improve the admin panel (Georg Ringer)
+2014-04-14 e6a71d8 #57466 [BUGFIX] Add available jQuery version to PageRenderer (Markus Klein)
+2014-04-14 ea5b974 #57873 [BUGFIX] impexp has to use module dispatcher (Markus Klein)
+2014-04-13 846ebe6 #52593 [BUGFIX] Fix impexp for importing exports from version 4.x (Marc Bastian Heinrichs)
+2014-04-13 7ea1093 [TASK] Mitigate erroring builds (Helmut Hummel)
+2014-04-13 4ecf903 #57872 [BUGFIX] Tests: Namespaced usage of vfsStream (Christian Kuhn)
+2014-04-13 c100e5e #57591 [BUGFIX] Make Extbase Cli\RequestBuilder a Singleton (Marc Bastian Heinrichs)
+2014-04-13 f262dde #57587 [BUGFIX] Admin users should ignore user mounts (Pascal Dürsteler)
+2014-04-13 6429de3 #57865 [CLEANUP] Remove unnecessary @todo annotations (Roland Waldner)
+2014-04-13 a2e4280 #57855 [CLEANUP] ImportExportController code style (Markus Klein)
+2014-04-12 70eccde #57785 [BUGFIX] Properly detect HHVM with fastcgi (Kevin Häfeli)
+2014-04-12 2c18566 #57814 [CLEANUP] Improve comments in TypoScriptFrontendController (Roland Waldner)
+2014-04-12 039467b #57421 [BUGFIX] Improve database scheme updater (Nicole Cordes)
+2014-04-12 4a4bdbc #57859 [TASK] Improve comments and phpdoc blocks in PageRepository (Roland Waldner)
+2014-04-12 8fce1f5 #57819 [CLEANUP] Fix length of comments to meet CGL (Roland Waldner)
+2014-04-12 7df75d2 #57661 [CLEANUP] Error handling classes (Steffen Müller)
+2014-04-12 2ae299b #47694 [BUGFIX] Follow up foreign_match_fields not fully supported (Marc Bastian Heinrichs)
+2014-04-12 c027ce8 #56772 [CLEANUP] Remove deprecated filemount functions in BE_USER (Benjamin Mack)
+2014-04-12 dd03642 #57788 [CLEANUP] Code style of authentication classes (Markus Klein)
+2014-04-12 cbbc785 #54903 [BUGFIX] Don't run processIncludes more than once (Peter Niederlag)
+2014-04-12 367a65f #50378 [BUGFIX] sql_free_result does not work with all allowed types (Wouter Wolters)
+2014-04-07 25c60e4 #57415 [BUGFIX] Use return values of array_map in local driver (Alexander Stehlik)
+2014-04-07 49c684f #57708 [BUGFIX] T3editor description loading (Markus Klein)
+2014-04-07 133f38b #57690 [BUGFIX] User settings do not obey setup.override (Markus Klein)
+2014-04-06 1806660 #57700 [BUGFIX] Fix incomplete mocking in ExtensionManagementUtilityTest (Helmut Hummel)
+2014-04-06 ae220dc #57499 [TASK] Improve deprecation msg of GeneralUtility method (Georg Ringer)
+2014-04-06 5c7a397 #57487 [TASK] Activate all packages in unit tests (Helmut Hummel)
+2014-04-05 69f5be0 #57676 [TASK] Avoid sysLog calls in MailUtilityTest (Markus Klein)
+2014-04-05 761fa18 #22020 [TASK] Return to "Admin Tools > User Admin" when exiting simulated BE User (Pascal Dürsteler)
+2014-04-04 eaad132 #55662 [BUGFIX] PHP warning due to missing preg_quote (Philipp Bergsmann)
+2014-04-04 0a33e1d #57603 [SECURITY] Prevent XSS in scheduler form (Nicole Cordes)
+2014-04-04 3c0c6a0 #52208,#57164 [BUGFIX] Correctly apply Extbase validator options and add tests (Stefan Neufeind)
+2014-04-03 b579893 #37421 [BUGFIX] Fetch RSA public key by Ajax before login (Helmut Hummel)
+2014-04-03 c67e8eb #57294 [BUGFIX] Do not reset Page Renderer on partial rendering (Stefan Froemken)
+2014-04-02 f797f4a #57572 [TASK] TceformsUpdateWizard: Throw exception if database query fails (Markus Klein)
+2014-04-02 38f484e #57495 [BUGFIX] FAL: Prevent invalid NULL value on metadata creation (Markus Klein)
+2014-04-02 d40ef86 #57467 [BUGFIX] Marker missing for page.includeCSSLibs (Markus Klein)
+2014-04-02 0c86ef1 #57295 [CLEANUP] Remove option "edit_wideDocument" (Benjamin Mack)
+2014-04-02 1896dac #57486 [TASK] Readd search string in module "Configuration" (Georg Ringer)
+2014-04-01 0a85c23 #56574 [BUGFIX] Use last result line of identify command (Alexander Stehlik)
+2014-04-01 64d0871 #57327 [BUGFIX] Fix relative path calculations in EM (Helmut Hummel)
+2014-04-01 fcf3a2f #57338 [BUGFIX] Make Typo3DbQueryParser a Singleton (Marc Bastian Heinrichs)
+2014-04-01 e3420ae #57518 [BUGFIX] Make Extbase EnvironmentService a Singleton (Marc Bastian Heinrichs)
+2014-04-01 ae7f6bb #57463 [BUGFIX] Check if lock directory is writable (Alexander Opitz)
+2014-04-01 680c83e #57458 [BUGFIX] Backup of LocalConfiguration.php missing on update (Nicole Cordes)
+2014-04-01 6942110 #57490 [BUGFIX] Remove the need of PackageStates.php in tests (Helmut Hummel)
+2014-04-01 28c66c5 #53973 [BUGFIX] Allow user defined locales to work with TSFE->sL() (Reinhard Führicht)
+2014-03-31 9bf671e #57451 [TASK] Web>Page Search: Remove duplicate CSS (Felix Kopp)
+2014-03-31 ccb8bc4 #57449 [TASK] Remove space in Page module notification (Georg Ringer)
+2014-03-30 cdf723e #57365 [BUGFIX] Respect config.debug setting for displaying parsetime (Georg Ringer)
+2014-03-30 45a91e6 #56988 [BUGFIX] Enable backend login for Internet Explorer 8 users (Nicole Cordes)
+2014-03-29 23ba3e8 [TASK] Cleanup ChangeLog from duplicate lines (Ernesto Baschny)
+2014-03-29 40265e9 #57264 [BUGFIX] Extension update fails if needed by other extensions (Nicole Cordes)
+2014-03-28 f610638 #57420 [BUGFIX] Update for sys_file_metadata returns SQL error (Nicole Cordes)
+2014-03-27 5c8016b #57346 [BUGFIX] CSC: file references not working with image compression (Benjamin Mack)
+2014-03-27 1b74cb4 #54833 [BUGFIX] Check default salting method first (Markus Klein)
+2014-03-26 1356c9d #56874 [BUGFIX] Add correctly escaped css selectors for js (Daniel Alder)
+2014-03-26 3dd0012 #57103 [BUGFIX] Install Tool-FAL metadata migration fails for big sets (Krystian Szymukowicz)
+2014-03-26 0700b7e #57285 [BUGFIX] Install tool update wizards show html tags in error message (Frans Saris)
+2014-03-26 9d14156 #55896 [BUGFIX] Load adminPanel styles for FE editing (Tim Lochmueller)
+2014-03-26 022a3fc #57291 [BUGFIX] Check WorkspaceEnabled for MM field related table (Sebastian Lechenbauer)
+2014-03-26 8359478 #57312 [BUGFIX] Fix initial file import in EM (Helmut Hummel)
+2014-03-26 fa4e68b #57246 [BUGFIX] Run scheduler from cli fails on DBAL (Andreas Fernandez)
+2014-03-25 0fbca20 [TASK] Set TYPO3 version to 6.2.1-dev (TYPO3 Release Team)
+
+
2014-03-25 c34148c [RELEASE] Release of TYPO3 6.2.0 (TYPO3 Release Team)
2014-03-25 a357923 [TASK] Small adjustments to NEWS.md (Ernesto Baschny)
2014-03-25 d0db6d6 #57298 [BUGFIX] GeneralUtility->copyDirectory does not fix permissions (Benjamin Mack)
diff --git a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
index 060c545380f4cf5777d8c640ed7e48983aa72f7a..eb8bf2d50c09abb7c9485a63d8fc037e65b2fd98 100644
--- a/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
+++ b/typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
@@ -90,7 +90,7 @@ class SystemEnvironmentBuilder {
*/
static protected function defineBaseConstants() {
// This version, branch and copyright
- define('TYPO3_version', '6.2.1-dev');
+ define('TYPO3_version', '6.2.1');
define('TYPO3_branch', '6.2');
define('TYPO3_copyright_year', '1998-2014');