diff --git a/.gitignore b/.gitignore
index cc368da7037..68b3d43138d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,7 @@ tools/devcloud/devcloudbox/.vagrant
 deps/*.jar
 deps/*.war
 deps/*.mar
+*.jar
+awsapi/modules/*
+!.gitignore
+
diff --git a/awsapi/modules/.gitignore b/awsapi/modules/.gitignore
new file mode 100644
index 00000000000..68b3d43138d
--- /dev/null
+++ b/awsapi/modules/.gitignore
@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF 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.
+
+build/replace.properties
+build/build.number
+bin/
+cloudstack-proprietary/
+premium/
+.lock-wscript
+artifacts/
+.waf-*
+waf-*
+target/
+override/
+.metadata
+dist/
+*~
+*.bak
+cloud-*.tar.bz2
+*.log
+*.pyc
+build.number
+api.log.*.gz
+cloud.log.*.*
+unittest
+deps/cloud.userlibraries
+deps/awsapi-lib/
+.DS_Store
+.idea
+*.iml
+git-remote-https.exe.stackdump
+*.swp
+tools/devcloud/devcloudbox/.vagrant
+deps/*.jar
+deps/*.war
+deps/*.mar
+*.jar
+awsapi/modules/*
+!.gitignore
+
diff --git a/cloud.spec b/cloud.spec
index 7b16a76be94..c31fe5bea15 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -288,6 +288,7 @@ Summary:   CloudStack CloudBridge
 Group:     System Environment/Libraries
 Requires: java >= 1.6.0
 Requires: tomcat6
+Requires: apache-commons-lang
 Obsoletes: cloud-bridge < %{version}-%{release}
 %description aws-api
 This is the CloudStack CloudBridge
@@ -475,11 +476,9 @@ fi
 %{_javadir}/xmlrpc-common-3.*.jar
 %{_javadir}/xmlrpc-client-3.*.jar
 %{_javadir}/wsdl4j-1.6.2.jar
-%{_javadir}/bcprov-jdk16-1.46.jar
 %{_javadir}/jsch-0.1.42.jar
 %{_javadir}/jasypt-1.*.jar
 %{_javadir}/commons-configuration-1.8.jar
-%{_javadir}/commons-lang-2.6.jar
 %{_javadir}/ejb-api-3.0.jar
 %{_javadir}/axis2-1.5.1.jar
 %{_javadir}/commons-discovery-0.5.jar
@@ -573,7 +572,6 @@ fi
 %files aws-api
 %defattr(0644,cloud,cloud,0755)
 %{_datadir}/cloud/bridge/conf/*
-%{_datadir}/cloud/bridge/lib/*
 %{_datadir}/cloud/bridge/webapps7080/*
 %attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/*
 %attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
diff --git a/wscript_build b/wscript_build
index 34aa80b8226..b3b1fdd6a71 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,7 +162,7 @@ def build_dependences ():
 
 	start_path = bld.path.find_dir ("deps")
 
-        bld.install_files('${JAVADIR}',start_path.ant_glob(["apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "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", 
+        bld.install_files('${JAVADIR}',start_path.ant_glob(["javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "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-nodep-2.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", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar",  "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)