diff --git a/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar
new file mode 100644
index 000000000..7eca57732
Binary files /dev/null and b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.3-SNAPSHOT.jar differ
diff --git a/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar
new file mode 100644
index 000000000..cd745e171
Binary files /dev/null and b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar differ
diff --git a/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar
new file mode 100644
index 000000000..b96389952
Binary files /dev/null and b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar differ
diff --git a/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar
new file mode 100644
index 000000000..6f3433dca
Binary files /dev/null and b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.3-SNAPSHOT.jar differ
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
index 810f3a6f2..60450ffb8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
@@ -480,18 +480,7 @@ public class PgpHelper {
     }
 
     public static boolean isSecretKeyPrivateEmpty(PGPSecretKey secretKey) {
-        try {
-            PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder()
-                    .setProvider(PgpMain.BOUNCY_CASTLE_PROVIDER_NAME).build(new char[] {});
-            PGPPrivateKey testKey = secretKey.extractPrivateKey(
-                    keyDecryptor);
-            if (testKey != null) {
-                return false;
-            }
-        } catch (PGPException e) { //exception if wrong key => not empty
-            return false; //all good if this fails, we likely didn't use the right password
-        }
-        return true;
+        return secretKey.isPrivateKeyEmpty();
     }
 
     public static boolean isSecretKeyPrivateEmpty(Context context, long keyId) {
diff --git a/README.md b/README.md
index 5bdf080df..f4922a635 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Fork OpenPGP Keychain and do a merge request. I will merge your changes back int
 
 ## Build with Eclipse
 
-1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain/android-libs/ActionBarSherlock"
-2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Kechain"
+1. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain/android-libs/ActionBarSherlock"
+2. File -> Import -> Android -> Existing Android Code Into Workspace, choose "OpenPGP-Keychain"
 3. OpenPGP-Kechain can now be build
 
 # Libraries
@@ -26,7 +26,7 @@ Fork OpenPGP Keychain and do a merge request. I will merge your changes back int
 All JAR-Libraries are provided in this repository under "libs", all Android Library projects are under "android-libs".
 
 * ActionBarSherlock to provide an ActionBar for Android < 3.0
-* Spongy Castle Crypto Lib (Android version of Bouncy Castle)
+* forked Spongy Castle Crypto Lib (Android version of Bouncy Castle)
 * android-support-v4.jar: Compatibility Lib
 * barcodescanner-android-integration-supportv4.jar: Barcode Scanner Integration
 
@@ -42,9 +42,12 @@ On error see: http://code.google.com/p/zxing/issues/detail?id=1207
 
 ## Build Spongy Castle
 
-Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android.
+Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android. OpenPGP-Keychain uses a forked version with some small changes to improve key import speed. These changes will be sent to Bouncy Castle, and Spongy Castle will be used again when they have filtered down.
+
+see
+* http://rtyley.github.com/spongycastle/
+* https://github.com/ashh87/spongycastle
 
-see http://rtyley.github.com/spongycastle/
 
 # Notes
 
@@ -162,4 +165,5 @@ OpenPGP Kechain is licensed under Apache License v2.
 
 * dashboard_scan_qrcode.svg  
   New creation for OpenPGP Kechain  
-  Apache License v2
\ No newline at end of file
+  Apache License v2
+