diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 20114937ef..f5ae0f7b23 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -210,6 +210,11 @@ Process
  * The `Symfony\Component\Process\ProcessBuilder` class has been deprecated,
    use the `Symfony\Component\Process\Process` class directly instead.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been deprecated.
+
 SecurityBundle
 --------------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 5d404598f7..c6e11a198f 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -583,6 +583,11 @@ Process
 
  * The `getEnhanceWindowsCompatibility()` and `setEnhanceWindowsCompatibility()` methods of the `Process` class have been removed.
 
+Profiler
+--------
+
+ * The `profiler.matcher` option has been removed.
+
 ProxyManager
 ------------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index dafd4c46bb..0c7581e7c0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Deprecated `profiler.matcher` option
  * Added support for `EventSubscriberInterface` on `MicroKernelTrait`
  * Removed `doctrine/cache` from the list of required dependencies in `composer.json`
  * Deprecated `validator.mapping.cache.doctrine.apc` service
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index cf24be14d9..6b98ef7cd4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -219,6 +219,7 @@ class Configuration implements ConfigurationInterface
                         ->booleanNode('only_master_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
                         ->arrayNode('matcher')
+                            ->setDeprecated('The "profiler.matcher" configuration key has been deprecated in Symfony 3.4 and it will be removed in 4.0.')
                             ->canBeEnabled()
                             ->performNoDeepMerging()
                             ->fixXmlConfig('ip')