diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 03e9174b..006d8bf1 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -30,7 +30,6 @@
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/conf/axis2/axis2_client.xml</exclude>
                 <exclude>**/conf/etc/launch.ini</exclude>
-                <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
 
                 <!-- Store Features -->
@@ -79,6 +78,8 @@
                 <exclude>**/repository/components/plugins/asm-all_4.1.0.wso2v1.jar</exclude>
 
                 <exclude>**/sso-idp-config.xml</exclude>
+                <exclude>**/application-authentication.xml</exclude>
+                <exclude>**/sso/jaggery.conf</exclude>
             </excludes>
         </fileSet>
 
@@ -128,6 +129,7 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
             <excludes>
                 <exclude>**/sso-idp-config.xml</exclude>
+                <exclude>**/application-authentication.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -207,6 +209,7 @@
             <includes>
                 <include>**/api-manager.xml</include>
                 <include>**/sso-idp-config.xml</include>
+                <include>**/application-authentication.xml</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -315,6 +318,7 @@
             </outputDirectory>
             <excludes>
                 <exclude>**/publisher/config/publisher-tenant.json</exclude>
+                <exclude>**/sso/jaggery.conf</exclude>
             </excludes>
         </fileSet>
         <!--============ Added with ES Features ===============-->
@@ -416,23 +420,25 @@
 
         <!--<fileSet>-->
             <!--<directory>src/repository/conf/security</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/-->
+            <!--</outputDirectory>-->
             <!--<includes>-->
                 <!--<include>**/application-authenticators.xml</include>-->
-                <!--&lt;!&ndash; Replacement for application-authenticators.xml &ndash;&gt;-->
+                <!--Replacement for application-authenticators.xml-->
                 <!--<include>**/application-authentication.xml</include>-->
             <!--</includes>-->
         <!--</fileSet>-->
 
         <!--============ Added with ES Features ===============-->
-			<!--Copies publisher specific config files that needs to be overriden for the CDMF-STORE. -->
-				<!--These files are already provided in the CDMF-Store feature too. -->
-				<!--However, given that the order of feature installation cannot be controlled, they are recopied at the product level.-->
+        <!--Copies publisher specific config files that needs to be overriden for the CDMF-STORE. -->
+        <!--These files are already provided in the CDMF-Store feature too. -->
+        <!--However, given that the order of feature installation cannot be controlled, they are recopied at the product level.-->
+
+        <!--<fileSet>-->
+            <!--<directory>src/publisher/config</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config</outputDirectory>-->
+        <!--</fileSet>-->
 
-<!--         <fileSet>
-            <directory>src/publisher/config</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/config</outputDirectory>
-        </fileSet> -->
         <!--========================================================================================================-->
         <!-- End of Enterprise Store Features -->
 
@@ -613,14 +619,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-	    <!--file>
-             <source>
-                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml
-             </source>
-             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
-             <filtered>true</filtered>
-             <fileMode>644</fileMode>
-         </file-->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd
@@ -704,33 +702,33 @@
         </file>
 
         <!-- Copying application-authentication.xml -->
-<!--         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file> -->
-
-<!--         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/msg-mgt.properties
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file> -->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/msg-mgt.properties-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
 
         <!-- Copying thrift-authentication.xml -->
-<!--         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file> -->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
@@ -759,7 +757,7 @@
         </file>
 
         <!--License Config file-->
-	<file>
+        <file>
             <source>
                 src/repository/conf/license-config.xml
             </source>
@@ -1026,7 +1024,7 @@
             <fileMode>755</fileMode>
         </file>
 
-         <!--Analytics REST APIs WebApp -->
+        <!--Analytics REST APIs WebApp -->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
@@ -1050,5 +1048,11 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>src/sso/jaggery.conf</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+
     </files>
 </assembly>
diff --git a/modules/distribution/src/repository/conf/identity/application-authentication.xml b/modules/distribution/src/repository/conf/identity/application-authentication.xml
new file mode 100644
index 00000000..9f02a255
--- /dev/null
+++ b/modules/distribution/src/repository/conf/identity/application-authentication.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- ~ Copyright (c) 2005-2014, WSO2 Inc. (http://www.wso2.org) All Rights 
+	Reserved. ~ ~ WSO2 Inc. licenses this file to you under the Apache License, 
+	~ Version 2.0 (the "License"); you may not use this file except ~ in compliance 
+	with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 
+	~ ~ Unless required by applicable law or agreed to in writing, ~ software 
+	distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT 
+	WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the 
+	License for the ~ specific language governing permissions and limitations 
+	~ under the License. -->
+
+<ApplicationAuthentication xmlns="http://wso2.org/projects/carbon/application-authentication.xml">
+
+	<JDBCPersistenceManager>
+		<DataSource>
+			<!-- Include a data source name (jndiConfigName) from the set of data 
+				sources defined in master-datasources.xml -->
+			<!--Name>jdbc/WSO2_IDP_DB</Name-->
+			<Name>jdbc/WSO2CarbonDB</Name>
+		</DataSource>
+	</JDBCPersistenceManager>
+	
+	<!-- 
+		ProxyMode allows framework to operate in either 'smart' mode 
+		or 'dumb' mode.
+		smart = both local and federated authentication is supported
+		dumb = only federated authentication is supported
+	-->
+	<ProxyMode>smart</ProxyMode>	
+	 
+	<!-- 
+		AuthenticationEndpointURL is location of the web app containing 
+		the authentication related pages 
+	--> 
+	<AuthenticationEndpointURL>/sso/login</AuthenticationEndpointURL>
+	
+	<!--
+		Extensions allow extending the default behaviour of the authentication
+		process. 	
+	-->
+	<Extensions> 
+		<RequestCoordinator>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator</RequestCoordinator>
+		<AuthenticationRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler</AuthenticationRequestHandler>
+		<LogoutRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler</LogoutRequestHandler>
+		<StepBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler</StepBasedSequenceHandler>
+		<RequestPathBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler</RequestPathBasedSequenceHandler>
+		<StepHandler>org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler</StepHandler>
+		<HomeRealmDiscoverer>org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer</HomeRealmDiscoverer>
+		<ClaimHandler>org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler</ClaimHandler>
+		<ProvisioningHandler>org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler</ProvisioningHandler>
+	</Extensions>
+
+	<!--
+		AuthenticatorNameMappings allow specifying an authenticator
+		against a pre-defined alias (which will be used by other components. 
+		E.g. Application Mgt component). This enables the usage of a custom 
+		authenticator in place of an authenticator that gets packed with the 
+		distribution.	
+	-->
+    <AuthenticatorNameMappings>
+        <AuthenticatorNameMapping name="BasicAuthenticator" alias="basic" />
+        <AuthenticatorNameMapping name="OAuthRequestPathAuthenticator" alias="oauth-bearer" />
+        <AuthenticatorNameMapping name="BasicAuthRequestPathAuthenticator" alias="basic-auth" />
+        <AuthenticatorNameMapping name="IWAAuthenticator" alias="iwa" />
+        <AuthenticatorNameMapping name="SAMLSSOAuthenticator" alias="samlsso" />
+        <AuthenticatorNameMapping name="OpenIDConnectAuthenticator" alias="openidconnect" />
+        <AuthenticatorNameMapping name="OpenIDAuthenticator" alias="openid" />
+        <AuthenticatorNameMapping name="PassiveSTSAuthenticator" alias="passive-sts" />
+    </AuthenticatorNameMappings>
+
+    <!-- 
+		AuthenticatorConfigs allow specifying various configurations needed 
+		by the authenticators by using any number of \'Parameter\' elements  
+		E.g.
+		<AuthenticatorConfig name="CustomAuthenticator" enabled="true" />
+			<Parameter name="paramName1">paramValue</Parameter>
+			<Parameter name="paramName2">paramValue</Parameter>
+		</AuthenticatorConfig>
+    -->
+	<AuthenticatorConfigs>
+		<AuthenticatorConfig name="BasicAuthenticator" enabled="true" />
+		<AuthenticatorConfig name="OAuthRequestPathAuthenticator" enabled="true" />
+		<AuthenticatorConfig name="BasicAuthRequestPathAuthenticator" enabled="true" />
+ 		<AuthenticatorConfig name="SAMLSSOAuthenticator" enabled="true">
+			<!--Parameter name="SAMLSSOManager">org.wso2.carbon.identity.application.authenticator.samlsso.manager.DefaultSAMLSSOManager</Parameter-->
+		</AuthenticatorConfig>
+		<AuthenticatorConfig name="OpenIDConnectAuthenticator" enabled="true">
+			<!--Parameter name="IDTokenHandler">org.wso2.carbon.identity.application.authenticator.oidc.DefaultIDTokenHandler</Parameter-->
+			<!--Parameter name="ClaimsRetriever">org.wso2.carbon.identity.application.authenticator.oidc.OIDCUserInfoClaimsRetriever</Parameter-->	
+		</AuthenticatorConfig>
+		<AuthenticatorConfig name="OpenIDAuthenticator" enabled="true">
+			<Parameter name="LoginPage">/authenticationendpoint/login.do</Parameter>
+			<Parameter name="TrustStorePath">/repository/resources/security/client-truststore.jks</Parameter>
+			<Parameter name="TrustStorePassword">wso2carbon</Parameter>
+			<!--Parameter name="OpenIDManager">org.wso2.carbon.identity.application.authenticator.openid.manager.DefaultOpenIDManager</Parameter>
+			<Parameter name="AttributesRequestor">org.wso2.carbon.identity.application.authenticator.openid.manager.SampleAttributesRequestor</Parameter-->
+		</AuthenticatorConfig>	
+	</AuthenticatorConfigs> 
+
+    <!--
+		Sequences allow specifying authentication flows for different
+		registered applications. \'default\' sequence is taken if an
+		application specific sequence doesn't exist in this file or
+		in the Application Mgt module.
+    -->	
+	<Sequences>
+		<!-- Default Sequence. This is mandatory -->
+		<Sequence appId="default">
+			<Step order="1">
+				<Authenticator name="BasicAuthenticator"/>
+			</Step>
+		</Sequence>
+	</Sequences>
+
+	<ServiceProvidersManagement>
+                <ApplicationDAO>org.wso2.carbon.identity.application.mgt.dao.impl.ApplicationDAOImpl</ApplicationDAO>
+                <OAuthOIDCClientDAO>org.wso2.carbon.identity.application.mgt.dao.impl.OAuthApplicationDAOImpl</OAuthOIDCClientDAO>
+                <SAMLClientDAO>org.wso2.carbon.identity.application.mgt.dao.impl.SAMLApplicationDAOImpl</SAMLClientDAO>
+                <SystemIDPDAO>org.wso2.carbon.identity.application.mgt.dao.impl.IdentityProviderDAOImpl</SystemIDPDAO>
+                <ClaimDialect>http://wso2.org/claims</ClaimDialect>
+        </ServiceProvidersManagement>
+
+</ApplicationAuthentication>
diff --git a/modules/distribution/src/sso/jaggery.conf b/modules/distribution/src/sso/jaggery.conf
new file mode 100644
index 00000000..7664d53d
--- /dev/null
+++ b/modules/distribution/src/sso/jaggery.conf
@@ -0,0 +1,84 @@
+{
+    "urlMappings": [
+        {
+            "url": "/sso.json",
+            "path": "/"
+        },
+        {
+            "url": "/is_errors.json",
+            "path": "/"
+        },
+        {
+            "url": "/modules/*",
+            "path": "/"
+        },
+        {
+            "url": "/config/*",
+            "path": "/"
+        },
+        {
+            "url": "/sso.js",
+            "path": "/"
+        },
+        {
+            "url": "/login",
+            "path": "/views/login.jag"
+        },
+        {
+            "url": "/register",
+            "path": "/views/register.jag"
+        },
+        {
+            "url": "/register_new_user",
+            "path": "/views/register_new_user.jag"
+        },
+        {
+             "url": "/confirm-recovery",
+             "path": "/views/confirm_recovery.jag"
+        },
+        {
+             "url": "/reset-link",
+             "path": "/views/reset_link.jag"
+        },
+        {
+             "url": "/update-password",
+             "path": "/views/update_password.jag"
+        },
+        {
+             "url": "/recover",
+             "path": "/views/recover_via_email.jag"
+        },
+        {
+             "url": "/recovery-success",
+             "path": "/views/recovery_success.jag"
+        },
+        {
+             "url": "/recovery-failed",
+             "path": "/views/recovery_failed.jag"
+        },
+        {
+             "url": "/user",
+             "path": "/apis/user.jag"
+        },
+        {
+             "url": "/password",
+             "path": "/apis/password.jag"
+        },
+        {
+             "url": "/captcha",
+             "path": "/apis/captcha.jag"
+        },
+        {
+             "url": "/challenge",
+             "path": "/apis/challenge.jag"
+         }
+    ],
+    "errorPages": {
+        "500": "/views/error500.html",
+        "404": "/views/error404.html"
+    },
+    "welcomeFiles": ["index.jag"],
+    "initScripts": ["config/app.js"],
+    "logLevel": "info",
+    "theme":"iotserver"
+}
\ No newline at end of file