diff --git a/pom.xml b/pom.xml
index 44542484c..b6622f9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,6 +255,12 @@
         <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <cdm.version>2.0.0-SNAPSHOT</cdm.version>
+        <!--Jaggery -->
+        <jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version>
+        <carbon.feature.version>1.1.0</carbon.feature.version>
+        <process.feature.version>1.0.0</process.feature.version>
+        <uuid.feature.version>1.0.0</uuid.feature.version>
+        <jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
         <!--Testing -->
         <test.framework.version>4.3.1</test.framework.version>
         <testng.version>6.8</testng.version>
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index ca621e202..e264c68c0 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -183,6 +183,13 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
+        <!-- copy cdm jaggery app -->
+        <fileSet>
+            <directory>src/repository/jaggeryapps</directory>
+            <outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps</outputDirectory>
+            <fileMode>755</fileMode>
+        </fileSet>
+
 
 
     </fileSets>
diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index d22887e7c..db84eac3c 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -115,6 +115,16 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>org.jaggeryjs.modules:carbon.feature:${carbon.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>org.jaggeryjs.modules:process.feature:${process.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>org.jaggeryjs.modules:uuid.feature:${uuid.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
@@ -253,6 +263,26 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.feature.group</id>
+                                    <version>${jaggery.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.carbon.feature.group</id>
+                                    <version>${carbon.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.process.feature.group</id>
+                                    <version>${process.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.uuid.feature.group</id>
+                                    <version>${uuid.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
+                                    <version>${jaggery-test.feature.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.transport.mgt.feature.group</id>
                                     <version>${carbon.platform.version}</version>