diff --git a/cloud.spec b/cloud.spec
index d6e215112b3..be29ae413ac 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -164,6 +164,7 @@ Requires: %{name}-utils = %{version}
 Requires: apache-commons-dbcp
 Requires: apache-commons-collections
 Requires: jakarta-commons-httpclient
+Requires: jakarta-taglibs-standard
 Requires: mysql-connector-java
 %endif
 
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index 06d07d70f42..54c411d7f7b 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -69,7 +69,7 @@ class DBDeployer(object):
     dbDotProperties = {}
     dbDotPropertiesIndex = 0
     encryptionKeyFile = '@MSCONF@/key'
-    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar'
+    encryptionJarPath = '@JAVADIR@/jasypt-1.9.0.jar'
     success = False
     magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
     tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql')
diff --git a/wscript_build b/wscript_build
index c5a2595044e..d25fb0605ad 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,9 +162,9 @@ def build_dependences ():
 
 	start_path = bld.path.find_dir ("deps")
 
-        bld.install_files('${JAVADIR}',start_path.ant_glob(["xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", 
+        bld.install_files('${JAVADIR}',start_path.ant_glob(["commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", 
          "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-2.2.jar", "xmlrpc-common-3.*.jar", 
-         "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "icontrol-1.0.jar", "manageontap-1.0.jar", "vmware-vim-1.0.jar", "vmware-vim25-1.0.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "ejb-api.3.0.jar", "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-20120825.123319-1.jar"], excl = excludes), cwd=start_path)
+         "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "icontrol-1.0.jar", "manageontap-1.0.jar", "vmware-vim-1.0.jar", "vmware-vim25-1.0.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-20120825.123319-1.jar"], excl = excludes), cwd=start_path)
 
 #def build_console_proxy ():
 	# binary unsubstitutable files:
diff --git a/wscript_configure b/wscript_configure
index 9a9b3584f6c..2b253cf1c25 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -61,12 +61,23 @@ systemjars = {
 		"tomcat6-servlet-2.5-api.jar",
 		"tomcat6-el-2.1-api-6.0.24.jar",
 		"tomcat6-jsp-2.1-api-6.0.24.jar",
+                "jakarta-taglibs-core-1.1.1.jar",
+                "jakarta-taglibs-standard-1.1.1.jar",
+                "tomcat6/jasper.jar",
+                "tomcat6/jasper-el.jar",
+                "tomcat6/jasper-jdt.jar",
+                
 	),
 	'CentOS':
 	(
 		"tomcat6-servlet-2.5-api.jar",
 		"tomcat6-jsp-2.1-api-6.0.24.jar",
 		"tomcat6-el-2.1-api-6.0.24.jar",
+                "jakarta-taglibs-core-1.1.1.jar",
+                "jakarta-taglibs-standard-1.1.1.jar",
+                "tomcat6/jasper.jar",
+                "tomcat6/jasper-el.jar",
+                "tomcat6/jasper-jdt.jar",
 		#"tomcat6/catalina.jar", # all supported distros put the file there
 	),
 	'Ubuntu':