diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
index 9304eb312ef..59642cb1f46 100644
--- a/debian/cloud-awsapi.install
+++ b/debian/cloud-awsapi.install
@@ -34,4 +34,3 @@
 /usr/share/java/woden*.jar
 /usr/share/java/xercesImpl*.jar
 /usr/share/java/xml-apis*.jar
-/usr/share/java/javassist*.jar
diff --git a/debian/control b/debian/control
index c818d8e4b41..7762e7321c3 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,6 @@ Description: CloudStack commandline tool
 Package: cloud-awsapi
 Provides: cloud-awsapi
 Architecture: any
-Depends: openjdk-6-jre, tomcat6, libcommons-lang-java 
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjavassist-java
 Description: CloudStack AWS API wrapper
  The CloudStack Amazon Webservices API wrapper
diff --git a/wscript_configure b/wscript_configure
index eeac3b88546..8014540e0dc 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -101,6 +101,7 @@ systemjars = {
 		"jna.jar",
 		"log4j-1.2.jar",
 		"catalina-tribes.jar",
+		"javassist.jar",
 	),
 	'Windows':
 	(
@@ -321,6 +322,7 @@ conf.env.SYSTEMCLASSPATH = pathsep.join([ in_system_javadir(x) for x in sysjars
 # these will install on Tomcat6's lib/ directory on Windows and Mac
 depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"deps","*.jar")) ]
 conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath)
+conf.env.DEPSCLASSPATH = "/usr/share/java/axis2-1.5.1.jar:" + conf.env.DEPSCLASSPATH
 
 # the MS classpath points to JARs required to run the management server
 msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware plugin-hypervisor-xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ]