Index: assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
===================================================================
--- assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml	(revision 1179587)
+++ assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml	(working copy)
@@ -283,7 +283,8 @@
                 org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
             <includes>
-                <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.api</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.core</include>
                 <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
             </includes>
         </dependencySet>
Index: assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
===================================================================
--- assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml	(revision 1179587)
+++ assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml	(working copy)
@@ -292,7 +292,8 @@
                 org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
             <includes>
-                <include>org.apache.aries.jmx:org.apache.aries.jmx</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.api</include>
+                <include>org.apache.aries.jmx:org.apache.aries.jmx.core</include>
                 <include>org.apache.aries.jmx:org.apache.aries.jmx.blueprint</include>
             </includes>
         </dependencySet>
Index: assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties
===================================================================
--- assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties	(revision 1179587)
+++ assemblies/apache-karaf/src/main/filtered-resources/minimal/startup.properties	(working copy)
@@ -52,5 +52,6 @@
 org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
 
 org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
 org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
Index: assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
===================================================================
--- assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties	(revision 1179587)
+++ assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties	(working copy)
@@ -57,7 +57,8 @@
 org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.management/${project.version}/org.apache.karaf.diagnostic.management-${project.version}.jar=30
 
 org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
-org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.api/${aries.jmx.version}/org.apache.aries.jmx.api-${aries.jmx.version}.jar=30
+org/apache/aries/jmx/org.apache.aries.jmx.core/${aries.jmx.version}/org.apache.aries.jmx.core-${aries.jmx.version}.jar=30
 org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
 
 org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
Index: assemblies/apache-karaf/pom.xml
===================================================================
--- assemblies/apache-karaf/pom.xml	(revision 1179587)
+++ assemblies/apache-karaf/pom.xml	(working copy)
@@ -303,10 +303,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.jmx</groupId>
-            <artifactId>org.apache.aries.jmx</artifactId>
+            <artifactId>org.apache.aries.jmx.api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
             <artifactId>org.apache.aries.jmx.blueprint</artifactId>
         </dependency>
         <dependency>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1179587)
+++ pom.xml	(working copy)
@@ -1086,11 +1086,16 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
-                <artifactId>org.apache.aries.jmx</artifactId>
+                <artifactId>org.apache.aries.jmx.api</artifactId>
                 <version>${aries.jmx.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
+                <artifactId>org.apache.aries.jmx.core</artifactId>
+                <version>${aries.jmx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.jmx</groupId>
                 <artifactId>org.apache.aries.jmx.blueprint</artifactId>
                 <version>${aries.jmx.version}</version>
                 <exclusions>