diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff8a4209..2e8f4fc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0](https://github.com/sonata-project/SonataTranslationBundle/compare/2.0.2...2.1.0) - 2017-01-17
+### Added
+- Addded missing flag image `ja.png`
+
+### Changed
+- Use `AbstractAdminExtension` instead of deprecated `AdminExtension`
+
+### Deprecated
+- Deprecate `Translatable` in favor of `TranslatableTrait`
+- Deprecate `PersonalTranslatable` in favor of `PersonalTranslatableTrait`
+
+### Fixed
+- Fix missing locale annotation for Gedmo trait
+- Display flags for locales with country code
+
 ## [2.0.2](https://github.com/sonata-project/SonataTranslationBundle/compare/2.0.1...2.0.2) - 2016-06-15
 ### Fixed
 - Remove wrong `doctrine-orm-admin-bundle` and `doctrine-phpcr-admin-bundle` composer requirements
diff --git a/Traits/Gedmo/PersonalTranslatable.php b/Traits/Gedmo/PersonalTranslatable.php
index ff17ed42..6708b639 100644
--- a/Traits/Gedmo/PersonalTranslatable.php
+++ b/Traits/Gedmo/PersonalTranslatable.php
@@ -12,7 +12,7 @@
 namespace Sonata\TranslationBundle\Traits\Gedmo;
 
 @trigger_error(
-    'The '.__NAMESPACE__.'\PersonalTranslatable class is deprecated since version 2.x and will be removed in 3.0.'.
+    'The '.__NAMESPACE__.'\PersonalTranslatable class is deprecated since version 2.1 and will be removed in 3.0.'.
     'Use the '.__NAMESPACE__.'\PersonalTranslatableTrait class instead.',
     E_USER_DEPRECATED
 );
@@ -24,7 +24,7 @@
  *
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  *
- * @deprecated since version 2.x and will be removed in 3.0
+ * @deprecated since version 2.1 and will be removed in 3.0
  */
 trait PersonalTranslatable
 {
diff --git a/Traits/Translatable.php b/Traits/Translatable.php
index 06c2a57e..7018a705 100644
--- a/Traits/Translatable.php
+++ b/Traits/Translatable.php
@@ -12,7 +12,7 @@
 namespace Sonata\TranslationBundle\Traits;
 
 @trigger_error(
-    'The '.__NAMESPACE__.'\Translatable class is deprecated since version 2.x and will be removed in 3.0.'.
+    'The '.__NAMESPACE__.'\Translatable class is deprecated since version 2.1 and will be removed in 3.0.'.
     'Use the '.__NAMESPACE__.'\TranslatableTrait class instead.',
     E_USER_DEPRECATED
 );
@@ -24,7 +24,7 @@
  *
  * @author Nicolas Bastien <nbastien.pro@gmail.com>
  *
- * @deprecated since version 2.x and will be removed in 3.0
+ * @deprecated since version 2.1 and will be removed in 3.0
  */
 trait Translatable
 {
diff --git a/UPGRADE-2.x.md b/UPGRADE-2.x.md
index 13bf61cd..5917e9ba 100644
--- a/UPGRADE-2.x.md
+++ b/UPGRADE-2.x.md
@@ -1,6 +1,9 @@
 UPGRADE 2.x
 ===========
 
+UPGRADE FROM 2.0 to 2.1
+=======================
+
 ### Tests
 
 All files under the ``Tests`` directory are now correctly handled as internal test classes.