diff --git a/proto/opamp.proto b/proto/opamp.proto
index 86c77d9..3cf78e7 100644
--- a/proto/opamp.proto
+++ b/proto/opamp.proto
@@ -708,6 +708,9 @@ enum AgentCapabilities {
     // know the configured interval and should not make assumptions about it.
     // Status: [Development]
     AgentCapabilities_ReportsHeartbeat               = 0x00002000;
+    // The will report AvailableComponents via the AgentToServer.available_components field.
+    // Status: [Development]    
+    AgentCapabilities_ReportsAvailableComponents     = 0x00004000;
     // Add new capabilities here, continuing with the least significant unused bit.
 }
 
diff --git a/specification.md b/specification.md
index 6e18ea8..e313522 100644
--- a/specification.md
+++ b/specification.md
@@ -698,7 +698,8 @@ See [CustomMessage](#custommessage) message for details.
 
 Status: [Development]
 
-A message listing the components available in the Agent.
+A message listing the components available in the Agent. This field SHOULD be
+reported if and only if the ReportsAvailableComponents capability is set.
 
 See [AvailableComponents](#availablecomponents-message) message for details.