diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1588953c..b83ec1232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.4.0...3.5.0) - 2017-03-08
+### Changed
+- `MediaController::downloadAction` signature to include Request as first parameter
+- `MediaController::viewAction` signature to include Request as first parameter
+- `MediaController::liipImagineFilterAction` signature to include Request as first parameter
+
+### Fixed
+- Optional dependency to SonataFormatterBundle is now on `^3.2`
+- Fixed issue when using SonataMediaBundle blocks in conjunction with SonataPageBundle and page composer (Sonata sandbox)
+- Double padding on media list
+
+### Removed
+- Removed an ugly hack to retrieve configuration on `AddProviderCompilerPass`
+
 ## [3.4.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.3.1...3.4.0) - 2017-02-28
 ### Added
 - An icon to admin menu (fa-image)
diff --git a/DependencyInjection/Compiler/AddProviderCompilerPass.php b/DependencyInjection/Compiler/AddProviderCompilerPass.php
index 835f01093..0e3701692 100644
--- a/DependencyInjection/Compiler/AddProviderCompilerPass.php
+++ b/DependencyInjection/Compiler/AddProviderCompilerPass.php
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
     public function fixSettings(ContainerBuilder $container)
     {
         @trigger_error(
-            'The '.__METHOD__.' method is deprecated since 3.x, to be removed in 4.0.',
+            'The '.__METHOD__.' method is deprecated since 3.5, to be removed in 4.0.',
             E_USER_DEPRECATED
         );
 
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
index f6e5c8189..67883cf62 100644
--- a/UPGRADE-3.x.md
+++ b/UPGRADE-3.x.md
@@ -1,6 +1,14 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.4 to 3.5
+=======================
+
+### Deprecations
+
+Sonata\MediaBundle\DependencyInjection\Compiler\AddProviderCompilerPass::fixSettings($container)
+is deprecated. Please avoid using this method, use ``getExtensionConfig($container)`` instead.
+
 UPGRADE FROM 3.2 to 3.3
 =======================
 
@@ -41,11 +49,6 @@ __construct($id, ThumbnailInterface $thumbnail, BackendInterface $backend, Event
 When creating a custom video provider, you have to implement the ``getReferenceUrl`` method to establish
 the media url.
 
-### Deprecations
-
-Sonata\MediaBundle\DependencyInjection\Compiler\AddProviderCompilerPass::fixSettings($container)
-is deprecated. Please avoid using this method, use ``getExtensionConfig($container)`` instead.
-
 UPGRADE FROM 3.0 to 3.1
 =======================