diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1024b560..b993d3da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 13.6
+* Deprecate `org.sonar.api.config.PropertyDefinitions`. Use `PropertyDefinition.builder(String)` to declare properties instead.
+
 ## 13.5
 * Introduce support for issue resolution from sensors:
   * Introduce `org.sonar.api.batch.sensor.issue.NewIssueResolution`
diff --git a/plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java b/plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
index 890754d7..9d67b15b 100644
--- a/plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
+++ b/plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
@@ -46,7 +46,9 @@
  * Metadata of all the properties declared by plugins
  *
  * @since 2.12
+ * @deprecated since 13.6. Use {@link PropertyDefinition#builder(String)} to declare properties instead.
  */
+@Deprecated(since = "13.6", forRemoval = true)
 @ScannerSide
 @ServerSide
 @ComputeEngineSide