diff --git a/UPGRADE.md b/UPGRADE.md
index 0f5a668f4be..5ac1f28d7df 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,5 +1,14 @@
# Upgrade to 2.17
+## Deprecate annotations classes for named queries
+
+The following classes have been deprecated:
+
+* `Doctrine\ORM\Mapping\NamedNativeQueries`
+* `Doctrine\ORM\Mapping\NamedNativeQuery`
+* `Doctrine\ORM\Mapping\NamedQueries`
+* `Doctrine\ORM\Mapping\NamedQuery`
+
## Deprecate `Doctrine\ORM\Query\Exec\AbstractSqlExecutor::_sqlStatements`
Use `Doctrine\ORM\Query\Exec\AbstractSqlExecutor::sqlStatements` instead.
diff --git a/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php b/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php
index bd474b4c39a..02ec6100b69 100644
--- a/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php
+++ b/lib/Doctrine/ORM/Mapping/NamedNativeQueries.php
@@ -8,6 +8,8 @@
* Is used to specify an array of native SQL named queries.
* The NamedNativeQueries annotation can be applied to an entity or mapped superclass.
*
+ * @deprecated Named queries won't be supported in ORM 3.
+ *
* @Annotation
* @Target("CLASS")
*/
diff --git a/lib/Doctrine/ORM/Mapping/NamedNativeQuery.php b/lib/Doctrine/ORM/Mapping/NamedNativeQuery.php
index 2970b266395..159b4962965 100644
--- a/lib/Doctrine/ORM/Mapping/NamedNativeQuery.php
+++ b/lib/Doctrine/ORM/Mapping/NamedNativeQuery.php
@@ -8,6 +8,8 @@
* Is used to specify a native SQL named query.
* The NamedNativeQuery annotation can be applied to an entity or mapped superclass.
*
+ * @deprecated Named queries won't be supported in ORM 3.
+ *
* @Annotation
* @Target("ANNOTATION")
*/
diff --git a/lib/Doctrine/ORM/Mapping/NamedQueries.php b/lib/Doctrine/ORM/Mapping/NamedQueries.php
index a69810639c0..d844ab325d1 100644
--- a/lib/Doctrine/ORM/Mapping/NamedQueries.php
+++ b/lib/Doctrine/ORM/Mapping/NamedQueries.php
@@ -5,6 +5,8 @@
namespace Doctrine\ORM\Mapping;
/**
+ * @deprecated Named queries won't be supported in ORM 3.
+ *
* @Annotation
* @Target("CLASS")
*/
diff --git a/lib/Doctrine/ORM/Mapping/NamedQuery.php b/lib/Doctrine/ORM/Mapping/NamedQuery.php
index f57e8e8d80e..104cd95c7f9 100644
--- a/lib/Doctrine/ORM/Mapping/NamedQuery.php
+++ b/lib/Doctrine/ORM/Mapping/NamedQuery.php
@@ -5,6 +5,8 @@
namespace Doctrine\ORM\Mapping;
/**
+ * @deprecated Named queries won't be supported in ORM 3.
+ *
* @Annotation
* @Target("ANNOTATION")
*/
diff --git a/psalm.xml b/psalm.xml
index 8905a3c4086..a8a096c3ae4 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -38,6 +38,10 @@
+
+
+
+