diff --git a/modules/distribution/src/core/bin/yajsw/wrapper.conf b/modules/distribution/src/core/bin/yajsw/wrapper.conf
index 38f80879..ffac5f20 100644
--- a/modules/distribution/src/core/bin/yajsw/wrapper.conf
+++ b/modules/distribution/src/core/bin/yajsw/wrapper.conf
@@ -75,16 +75,17 @@ placeHolderSoGenPropsComeHere=
 wrapper.java.command = ${java_home}\\bin\\java
 wrapper.java.classpath.1 = ${java_home}\\lib\\tools.jar
 wrapper.java.classpath.2 = ${carbon_home}\\bin\\*.jar
+wrapper.java.classpath.3 = ${carbon_home}\\wso2\\components\\plugins\\commons-lang_2.6.0.wso2v1.jar
 wrapper.app.parameter.1 = org.wso2.carbon.bootstrap.Bootstrap
 wrapper.app.parameter.2 = RUN
-wrapper.java.additional.1 = -Xbootclasspath\/a:${carbon_home}\\lib\\xboot\\*.jar
+wrapper.java.additional.1 = -Xbootclasspath\/a:${carbon_home}\\wso2\\lib\\xboot\\*.jar
 wrapper.java.additional.2 = -Xms256m
 wrapper.java.additional.3 = -Xmx1024m
 wrapper.java.additional.4 = -XX:MaxPermSize=512m
 wrapper.java.additional.5 = -XX:+HeapDumpOnOutOfMemoryError
 wrapper.java.additional.6 = -XX:HeapDumpPath=${carbon_home}\\repository\\logs\\heap-dump.hprof
 wrapper.java.additional.7 = -Dcom.sun.management.jmxremote
-wrapper.java.additional.8 = -Djava.endorsed.dirs=${carbon_home}\\wso2\\lib\\endorsed;${java_home}\\jre\\lib\\endorsed;${java_home}\\wso2\\lib\\endorsed
+wrapper.java.additional.8 = -Djava.endorsed.dirs=${carbon_home}\\wso2\\lib\\endorsed;${java_home}\\jre\\lib\\endorsed
 wrapper.java.additional.9 = -Dcarbon.registry.root=\/
 wrapper.java.additional.10 = -Dcarbon.home=${carbon_home}
 wrapper.java.additional.11 = -Dwso2.server.standalone=true