diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 006c83f75ab..d260debc015 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -225,7 +225,7 @@
 		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.9.jar" />
+				<include name="jasypt-1.9.0.jar" />
                                 <include name="cloud-utils.jar" />
 			</fileset>
 		</copy>
@@ -299,7 +299,7 @@
 			</fileset>
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.9.jar" />
+				<include name="jasypt-1.9.0.jar" />
 			</fileset>
 		</copy>
 		<copy todir="${debian.tomcat.dir}/lib">
@@ -374,7 +374,7 @@
 			</fileset> -->
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
-				<include name="cloud-jasypt-1.9.jar" />
+				<include name="jasypt-1.9.0.jar" />
 			</fileset>
 		</copy>
 		<copy todir="${rpm.tomcat.dir}/lib">
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index b2842ef9496..040be5b06bf 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -68,7 +68,7 @@ class DBDeployer(object):
     dbDotProperties = {}
     dbDotPropertiesIndex = 0
     encryptionKeyFile = '@MSCONF@/key'
-    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.9.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/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 5f0d35e5bb7..19ad721ccbe 100755
--- a/setup/bindir/cloud-setup-encryption.in
+++ b/setup/bindir/cloud-setup-encryption.in
@@ -63,7 +63,7 @@ class DBDeployer(object):
     dbDotProperties = {}
     dbDotPropertiesIndex = 0
     encryptionKeyFile = '@MSCONF@/key'
-    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.jar:@JAVADIR@/jasypt-1.9.jar'
+    encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.jar'
     success = False
     magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'