diff --git a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java
index 5c3fc2445..c7fd4c4b8 100644
--- a/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java
+++ b/smack-openpgp-bouncycastle/src/main/java/org/jivesoftware/smackx/ox/bouncycastle/BouncycastleOpenPgpProvider.java
@@ -16,17 +16,108 @@
  */
 package org.jivesoftware.smackx.ox.bouncycastle;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.SignatureException;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Set;
 
 import org.jivesoftware.smackx.ox.OpenPgpMessage;
 import org.jivesoftware.smackx.ox.OpenPgpProvider;
 
+import name.neuhalfen.projects.crypto.bouncycastle.openpgp.BouncyGPG;
+import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.callbacks.KeySelectionStrategy;
+import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.callbacks.Xep0373KeySelectionStrategy;
+import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.keyrings.KeyringConfig;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openpgp.PGPEncryptedData;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPKeyPair;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
+import org.bouncycastle.util.io.Streams;
+import org.jxmpp.jid.BareJid;
+import org.jxmpp.jid.Jid;
+
 public class BouncycastleOpenPgpProvider implements OpenPgpProvider {
 
+    public static final Provider PROVIDER = new BouncyCastleProvider();
+
+    private final KeyringConfig keyringConfig;
+    private final BareJid signingIdentity;
+    private final KeySelectionStrategy keySelectionStrategy = new Xep0373KeySelectionStrategy(new Date());
+
+    public BouncycastleOpenPgpProvider(KeyringConfig config, BareJid signingIdentity) throws IOException, PGPException {
+        this.keyringConfig = config;
+        this.signingIdentity = signingIdentity;
+    }
+
+    public OpenPgpMessage toOpenPgpMessage(InputStream is, Set<Jid> recipients, Jid signer)
+            throws IOException, PGPException, NoSuchAlgorithmException, SignatureException, NoSuchProviderException {
+
+        String[] to = new String[recipients.size()];
+        Iterator<Jid> it = recipients.iterator();
+        for (int i = 0; i<recipients.size(); i++) {
+            to[i] = "xmpp:" + it.next().asBareJid().toString();
+        }
+
+        OutputStream resultStream = new ByteArrayOutputStream();
+
+        OutputStream os = BouncyGPG.encryptToStream()
+                .withConfig(keyringConfig)
+                .withKeySelectionStrategy(keySelectionStrategy)
+                .withOxAlgorithms()
+                .toRecipients(to)
+                .andSignWith("xmpp:" + signer.asBareJid().toString())
+                .binaryOutput()
+                .andWriteTo(resultStream);
+
+        Streams.pipeAll(is, os);
+        os.close();
+
+        byte[] encrypted = ((ByteArrayOutputStream) resultStream).toByteArray();
+        return new OpenPgpMessage(OpenPgpMessage.State.signcrypt, new String(encrypted, Charset.forName("UTF-8")));
+    }
+
+    public static PGPSecretKey generateKey(BareJid owner, char[] passPhrase) throws NoSuchAlgorithmException, PGPException {
+        // Create RSA Key Pair
+        KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA", PROVIDER);
+        generator.initialize(2048);
+        KeyPair rsaPair = generator.generateKeyPair();
+
+        PGPDigestCalculator calculator = new JcaPGPDigestCalculatorProviderBuilder()
+                .setProvider(PROVIDER)
+                .build()
+                .get(HashAlgorithmTags.SHA256);
+
+        PGPKeyPair pgpPair = new JcaPGPKeyPair(PGPPublicKey.RSA_GENERAL, rsaPair, new Date());
+        PGPSecretKey secretKey = new PGPSecretKey(PGPSignature.DEFAULT_CERTIFICATION,
+                pgpPair, "xmpp:" + owner.toString(), calculator, null, null,
+                new JcaPGPContentSignerBuilder(pgpPair.getPublicKey().getAlgorithm(), HashAlgorithmTags.SHA256),
+                new JcePBESecretKeyEncryptorBuilder(PGPEncryptedData.AES_256, calculator)
+                        .setProvider(PROVIDER).build(passPhrase));
+
+        return secretKey;
+    }
+
     @Override
     public OpenPgpMessage toOpenPgpMessage(InputStream is) {
-        // TODO Auto-generated method stub
         return null;
     }
-
 }
diff --git a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
index 3c5e9d7d1..f684085f7 100644
--- a/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
+++ b/smack-openpgp-bouncycastle/src/test/java/org/jivesoftware/smackx/ox/bouncycastle/BasicEncryptionTest.java
@@ -36,7 +36,7 @@ import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smackx.ox.TestKeys;
 
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.BouncyGPG;
-import name.neuhalfen.projects.crypto.bouncycastle.openpgp.algorithms.DefaultPGPAlgorithmSuites;
+import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.callbacks.KeySelectionStrategy;
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.callbacks.KeyringConfigCallbacks;
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.callbacks.Xep0373KeySelectionStrategy;
 import name.neuhalfen.projects.crypto.bouncycastle.openpgp.keys.keyrings.InMemoryKeyring;
@@ -74,14 +74,15 @@ public class BasicEncryptionTest extends SmackTestSuite {
 
 
         ByteArrayOutputStream result = new ByteArrayOutputStream();
+        KeySelectionStrategy selectionStrategy = new Xep0373KeySelectionStrategy(new Date());
 
         byte[] message = "Hello World!!!!".getBytes(UTF8);
 
         // Encrypt
         OutputStream out = BouncyGPG.encryptToStream()
                 .withConfig(keyringJuliet)
-                .withKeySelectionStrategy(new Xep0373KeySelectionStrategy(new Date()))
-                .withAlgorithms(DefaultPGPAlgorithmSuites.defaultSuiteForGnuPG())
+                .withKeySelectionStrategy(selectionStrategy)
+                .withOxAlgorithms()
                 .toRecipients(ROMEO_UID, JULIET_UID)
                 .andSignWith(JULIET_UID)
                 .binaryOutput()
@@ -96,7 +97,7 @@ public class BasicEncryptionTest extends SmackTestSuite {
         ByteArrayInputStream encIn = new ByteArrayInputStream(encrypted);
         InputStream in = BouncyGPG.decryptAndVerifyStream()
                 .withConfig(keyringRomeo)
-                .withKeySelectionStrategy(new Xep0373KeySelectionStrategy(new Date()))
+                .withKeySelectionStrategy(selectionStrategy)
                 .andRequireSignatureFromAllKeys(JULIET_UID)
                 .fromEncryptedInputStream(encIn);
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpKeyStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpKeyStore.java
new file mode 100644
index 000000000..2f0850164
--- /dev/null
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpKeyStore.java
@@ -0,0 +1,8 @@
+package org.jivesoftware.smackx.ox;
+
+public class OpenPgpKeyStore {
+
+    public OpenPgpKeyStore() {
+
+    }
+}
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
index 58bcdc61d..60db44b96 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
@@ -28,7 +28,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 public class OpenPgpMessage {
 
-    enum State {
+    public enum State {
         signcrypt,
         sign,
         crypt,