diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6805c6a91..5f449e1cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [3.1.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.0.0...3.1.0) - 2016-07-22
+### Added
+- Added `Sonata\MediaBundle\Listener\ORM\MediaEventSubscriber::onClear` to clear the `rootCategories` cache when the EntityManager is cleared
+- Added `region` key to S3Client config
+- Added `alt` attribute to thumbnail twig tag
+
+### Changed
+- Injection of `Session` instead of the whole `Container` in `Security/SessionDownloadStrategy`
+- `Sonata\MediaBundle\Listener\ORM\MediaEventSubscriber::onClear` now subscribes to `onClear` too
+
+### Deprecated
+- `$container` property in `Security/SessionDownloadStrategy`
+- Deprecated `Pool::$downloadSecurities` for `Pool::$downloadStrategies` property
+- Deprecated `Pool::addDownloadSecurity` for `Pool::addDownloadStrategy` method
+- Deprecated `Pool::getDownloadSecurity` for `Pool::getDownloadStrategy` method
+
+### Fixed
+- Restored `ApiDoc` and `QueryParam` use statements in `Api/GalleryController`
+- Added missing `sonata-project/block-bundle` dependency
+- Fixed media widget spanish translations
+- Support for FOSRestBundle 2.0
+- Fixed `ApiMediaType::getParent` compatibility with Symfony3 forms
+- Fixed `MediaType::buildForm` compatibility with Symfony3 forms
+- Fixed `MediaType::getParent` compatibility with Symfony3 forms
+- Fixed `BaseVideoProvider::buildEditForm` compatibility with Symfony3 forms
+- Fixed `BaseVideoProvider::buildCreateForm` compatibility with Symfony3 forms
+- Fixed `BaseVideoProvider:: buildMediaType` compatibility with Symfony3 forms
+- Fixed `FileProvider::buildEditForm` compatibility with Symfony3 forms
+- Fixed `FileProvider::buildCreateForm` compatibility with Symfony3 forms
+- Fixed `FileProvider::buildMediaType` compatibility with Symfony3 forms
+- Fixed mixed-content error when loading Pixlr editor under https
+- Gaufrette compatibility with Symfony 3
+- Fix deprecated usage of `Admin` class
+- Added missing `BaseProvider::$name` property
+- Removed double translation in gallery edit form
+- Reuse of root categories instances after the entity manager has been cleared
+
+### Removed
+- Internal test classes are now excluded from the autoloader
diff --git a/Provider/Pool.php b/Provider/Pool.php
index 6e98d9d82..e5ea36ee0 100644
--- a/Provider/Pool.php
+++ b/Provider/Pool.php
@@ -28,7 +28,7 @@ class Pool
     protected $contexts = array();
 
     /**
-     * @deprecated Deprecated since version 3.x and will be removed in 4.0. Use $downloadStrategies instead
+     * @deprecated Deprecated since version 3.1 and will be removed in 4.0. Use $downloadStrategies instead
      *
      * @var DownloadStrategyInterface[]
      */
@@ -84,14 +84,14 @@ public function addProvider($name, MediaProviderInterface $instance)
     }
 
     /**
-     * @deprecated Deprecated since version 3.x, to be removed in 4.0
+     * @deprecated Deprecated since version 3.1, to be removed in 4.0
      *
      * @param string                    $name
      * @param DownloadStrategyInterface $security
      */
     public function addDownloadSecurity($name, DownloadStrategyInterface $security)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.1 and will be removed in 4.0.', E_USER_DEPRECATED);
 
         $this->downloadSecurities[$name] = $security;
 
@@ -244,7 +244,7 @@ public function getProviderList()
     }
 
     /**
-     * @deprecated Deprecated since version 3.x, to be removed in 4.0
+     * @deprecated Deprecated since version 3.1, to be removed in 4.0
      *
      * @param MediaInterface $media
      *
@@ -254,7 +254,7 @@ public function getProviderList()
      */
     public function getDownloadSecurity(MediaInterface $media)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.x and will be removed in 4.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.1 and will be removed in 4.0.', E_USER_DEPRECATED);
 
         return array_merge($this->getDownloadSecurity($media), $this->getDownloadStrategy($media));
     }
diff --git a/Security/SessionDownloadStrategy.php b/Security/SessionDownloadStrategy.php
index 3441dd403..88586f108 100644
--- a/Security/SessionDownloadStrategy.php
+++ b/Security/SessionDownloadStrategy.php
@@ -27,7 +27,7 @@ class SessionDownloadStrategy implements DownloadStrategyInterface
     /**
      * @var ContainerInterface
      *
-     * @deprecated Since version 3.x, will be removed in 4.0.
+     * @deprecated Since version 3.1, will be removed in 4.0.
      * NEXT_MAJOR : remove this property
      */
     protected $container;
@@ -63,7 +63,7 @@ public function __construct(TranslatorInterface $translator, $session, $times)
         if ($session instanceof ContainerInterface) {
             @trigger_error(
                 'Using an instance of Symfony\Component\DependencyInjection\ContainerInterface is deprecated since 
-                version 3.x and will be removed in 4.0. 
+                version 3.1 and will be removed in 4.0. 
                 Use Symfony\Component\HttpFoundation\Session\SessionInterface instead.',
                 E_USER_DEPRECATED
             );
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
index 0ee874bb2..fac2634f8 100644
--- a/UPGRADE-3.x.md
+++ b/UPGRADE-3.x.md
@@ -1,6 +1,9 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.0 to 3.1
+=======================
+
 ### Tests
 
 All files under the ``Tests`` directory are now correctly handled as internal test classes.