diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 29f231d5df..62313e5369 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -55,7 +55,7 @@
 
     <!-- for zerconf discovery -->
     <dependency>
-      <groupId>javax.jmdns</groupId>
+      <groupId>org.jmdns</groupId>
       <artifactId>jmdns</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 7b5bdda584..f4f3ca9e12 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -114,7 +114,7 @@
           <artifactId>jakarta-regexp</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.jmdns</groupId>
+          <groupId>org.jmdns</groupId>
           <artifactId>jmdns</artifactId>
         </exclusion>
         <exclusion>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 97d9f68527..4fa1c7fe3d 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -205,7 +205,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.jmdns</groupId>
+      <groupId>org.jmdns</groupId>
       <artifactId>jmdns</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3292c5033c..872ca3e154 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -229,7 +229,7 @@
       <artifactId>jaxp-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.jmdns</groupId>
+      <groupId>org.jmdns</groupId>
       <artifactId>jmdns</artifactId>
     </dependency>
     <dependency>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 18882634ff..83dfba0f1d 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -214,7 +214,7 @@
         <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.josql</include>
         <include>org.jasypt:jasypt</include>
         <include>org.jasypt:jasypt-spring4</include>
-        <include>javax.jmdns:jmdns</include>
+        <include>org.jmdns:jmdns</include>
         <include>org.apache.qpid:proton-j</include>
         <include>${pom.groupId}:activemq-runtime-config</include>
         <include>org.jvnet.jaxb2_commons:jaxb2-basics-runtime</include>
diff --git a/pom.xml b/pom.xml
index ea7f65d44f..8a15a5fe4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <jaxb-bundle-version>2.3.2_1</jaxb-bundle-version>
     <jetty9-version>9.4.50.v20221201</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
-    <jmdns-version>3.4.1</jmdns-version>
+    <jmdns-version>3.5.8</jmdns-version>
     <tomcat-api-version>9.0.65</tomcat-api-version>
     <jettison-version>1.5.3</jettison-version>
     <jmock-version>2.5.1</jmock-version>
@@ -659,7 +659,7 @@
 
       <!-- zeroconf transport -->
       <dependency>
-        <groupId>javax.jmdns</groupId>
+        <groupId>org.jmdns</groupId>
         <artifactId>jmdns</artifactId>
         <version>${jmdns-version}</version>
       </dependency>