diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 7422ec0fd6..1a65aeab56 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -12,6 +12,9 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="groovy-all-1.7.5.jar"/>
 	<classpathentry kind="lib" path="super-csv-2.0.0-beta-1.jar" sourcepath="/home/carlos/libsources/super-csv-2.0.0-beta-1-sources.jar"/>
+	<classpathentry kind="lib" path="bctsp-jdk14-1.38.jar"/>
+	<classpathentry kind="lib" path="bcmail-jdk14-1.38.jar"/>
+	<classpathentry kind="lib" path="bcprov-jdk14-1.38.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<accessrules>
 			<accessrule kind="accessible" pattern="com/sun/rowset/*"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 4bb504b556..42ad9cb731 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -18,7 +18,10 @@ Bundle-ClassPath: base.jar,
  groovy-all-1.7.5.jar,
  vt-dictionary-3.0.jar,
  vt-password-3.1.1.jar,
- super-csv-2.0.0-beta-1.jar
+ super-csv-2.0.0-beta-1.jar,
+ bctsp-jdk14-1.38.jar,
+ bcmail-jdk14-1.38.jar,
+ bcprov-jdk14-1.38.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
@@ -121,6 +124,87 @@ Export-Package: bsh,
  org.adempiere.print.export,
  org.adempiere.process,
  org.adempiere.util,
+ org.bouncycastle,
+ org.bouncycastle.asn1,
+ org.bouncycastle.asn1.cmp,
+ org.bouncycastle.asn1.cms,
+ org.bouncycastle.asn1.crmf,
+ org.bouncycastle.asn1.cryptopro,
+ org.bouncycastle.asn1.esf,
+ org.bouncycastle.asn1.ess,
+ org.bouncycastle.asn1.gnu,
+ org.bouncycastle.asn1.iana,
+ org.bouncycastle.asn1.icao,
+ org.bouncycastle.asn1.isismtt,
+ org.bouncycastle.asn1.isismtt.ocsp,
+ org.bouncycastle.asn1.isismtt.x509,
+ org.bouncycastle.asn1.kisa,
+ org.bouncycastle.asn1.microsoft,
+ org.bouncycastle.asn1.misc,
+ org.bouncycastle.asn1.mozilla,
+ org.bouncycastle.asn1.nist,
+ org.bouncycastle.asn1.ntt,
+ org.bouncycastle.asn1.ocsp,
+ org.bouncycastle.asn1.oiw,
+ org.bouncycastle.asn1.pkcs,
+ org.bouncycastle.asn1.sec,
+ org.bouncycastle.asn1.smime,
+ org.bouncycastle.asn1.teletrust,
+ org.bouncycastle.asn1.tsp,
+ org.bouncycastle.asn1.util,
+ org.bouncycastle.asn1.x500,
+ org.bouncycastle.asn1.x509,
+ org.bouncycastle.asn1.x509.qualified,
+ org.bouncycastle.asn1.x509.sigi,
+ org.bouncycastle.asn1.x9,
+ org.bouncycastle.cms,
+ org.bouncycastle.crypto,
+ org.bouncycastle.crypto.agreement,
+ org.bouncycastle.crypto.agreement.kdf,
+ org.bouncycastle.crypto.digests,
+ org.bouncycastle.crypto.encodings,
+ org.bouncycastle.crypto.engines,
+ org.bouncycastle.crypto.examples,
+ org.bouncycastle.crypto.generators,
+ org.bouncycastle.crypto.io,
+ org.bouncycastle.crypto.macs,
+ org.bouncycastle.crypto.modes,
+ org.bouncycastle.crypto.paddings,
+ org.bouncycastle.crypto.params,
+ org.bouncycastle.crypto.prng,
+ org.bouncycastle.crypto.signers,
+ org.bouncycastle.crypto.tls,
+ org.bouncycastle.crypto.util,
+ org.bouncycastle.i18n,
+ org.bouncycastle.i18n.filter,
+ org.bouncycastle.jce,
+ org.bouncycastle.jce.examples,
+ org.bouncycastle.jce.exception,
+ org.bouncycastle.jce.interfaces,
+ org.bouncycastle.jce.netscape,
+ org.bouncycastle.jce.provider,
+ org.bouncycastle.jce.provider.symmetric,
+ org.bouncycastle.jce.spec,
+ org.bouncycastle.mail.smime,
+ org.bouncycastle.mail.smime.examples,
+ org.bouncycastle.mail.smime.handlers,
+ org.bouncycastle.mail.smime.util,
+ org.bouncycastle.mail.smime.validator,
+ org.bouncycastle.math.ec,
+ org.bouncycastle.mozilla,
+ org.bouncycastle.ocsp,
+ org.bouncycastle.openssl,
+ org.bouncycastle.sasn1,
+ org.bouncycastle.sasn1.cms,
+ org.bouncycastle.tsp,
+ org.bouncycastle.util,
+ org.bouncycastle.util.encoders,
+ org.bouncycastle.util.test,
+ org.bouncycastle.voms,
+ org.bouncycastle.x509,
+ org.bouncycastle.x509.examples,
+ org.bouncycastle.x509.extension,
+ org.bouncycastle.x509.util,
  org.codehaus.groovy,
  org.codehaus.groovy.ant,
  org.codehaus.groovy.antlr,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 589a5d3ac7..61b17bc235 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -33,7 +33,10 @@ bin.includes = META-INF/,\
                OSGI-INF/defaultaddressvalidationfactory.xml,\
                OSGI-INF/defaulttaxproviderfactory.xml,\
                OSGI-INF/addressvalidationeventhandler.xml,\
-               schema/
+               schema/,\
+               bctsp-jdk14-1.38.jar,\
+               bcmail-jdk14-1.38.jar,\
+               bcprov-jdk14-1.38.jar
 output.base.jar = build/
 src.includes = schema/
 source.base.jar = src/