diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 4078085937c..a4f9513dac8 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -547,4 +547,22 @@
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security57.version}</bundle>
     </feature>
 
+    <feature name="spring-security" description="Spring Security 5.8.x support" version="${spring.security58.version}">
+        <feature>pax-web-jsp</feature>
+        <feature>pax-web-war</feature>
+        <feature version="[5.3,5.4)">spring-jdbc</feature>
+        <feature version="[5.3,5.4)">spring-tx</feature>
+        <feature version="[5.3,5.4)">spring-web</feature>
+        <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+        <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security58.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security58.version}</bundle>
+    </feature>
+
 </features>
diff --git a/pom.xml b/pom.xml
index 34954a67281..2a7a9f7be66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,6 +363,7 @@
         <spring.security55.version>5.5.3_1</spring.security55.version>
         <spring.security56.version>5.6.3_1</spring.security56.version>
         <spring.security57.version>5.7.12_4</spring.security57.version>
+        <spring.security58.version>5.8.16_1</spring.security58.version>
         <spring.security62.version>6.2.7_3</spring.security62.version>
 
         <sling.commons.johnzon.version>1.2.16</sling.commons.johnzon.version>