diff --git a/scrplugin/annotations/changelog.txt b/scrplugin/annotations/changelog.txt
index b26d166..e6c4f32 100644
--- a/scrplugin/annotations/changelog.txt
+++ b/scrplugin/annotations/changelog.txt
@@ -1,5 +1,11 @@
- Changes from 1.9.4 to 1.9.2
-----------------------------
+Changes from 1.9.6 to 1.9.4
+---------------------------
+** Improvement
+    * [FELIX-4170] - Deprecate inheritance of component descriptors
+
+
+Changes from 1.9.4 to 1.9.2
+---------------------------
 ** Bug
     * [FELIX-4047] - Unable to create single valued (String) array property
 
@@ -7,20 +13,20 @@
     * [FELIX-4063] - Avoid warnings when using @SlingServlet and @SlingFilter annotations 
 
 
- Changes from 1.9.2 to 1.9.0
-----------------------------
+Changes from 1.9.2 to 1.9.0
+---------------------------
 ** Bug
     * [FELIX-3977] -  @Property: ArrayIndexOutOfBoundsException empty array default value  
 
 
- Changes from 1.9.0 to 1.8.0
-----------------------------
+Changes from 1.9.0 to 1.8.0
+---------------------------
 ** Bug
     * [FELIX-3940] - Abstract class is not detected 
  
  
- Changes from 1.8.0 to 1.7.0
-----------------------------
+Changes from 1.8.0 to 1.7.0
+---------------------------
 ** Improvement
     * [FELIX-3169] - Add support for new PASSWORD attribute type of Metatype service
 
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
index f6ee448..334b246 100644
--- a/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
+++ b/scrplugin/annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
@@ -78,6 +78,7 @@
     /**
      * Whether any service, property and reference declarations from base
      * classes should be inherited by this class.
+     * @deprecated This feature will not be supported in future versions.
      */
     boolean inherit() default true;
 
@@ -93,6 +94,7 @@
      * This marks an abstract service description which is not added to the
      * descriptor but intended for reuse through inheritance. This attribute
      * defaults to true for abstract classes and false for concrete classes.
+     * @deprecated This feature will not be supported in future versions.
      */
     boolean componentAbstract() default false;