diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
index ad4aaf5f6..2543f0129 100644
--- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="18" />
 
     <application
         android:allowBackup="true"
diff --git a/OpenPGP-Keychain-API-Demo/project.properties b/OpenPGP-Keychain-API-Demo/project.properties
index d2daeb321..73fc66102 100644
--- a/OpenPGP-Keychain-API-Demo/project.properties
+++ b/OpenPGP-Keychain-API-Demo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-15
\ No newline at end of file
+target=android-18
diff --git a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index f0528572d..a84d026bf 100644
--- a/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/openintents/openpgp/OpenPgpSignatureResult.java
@@ -84,7 +84,7 @@ public class OpenPgpSignatureResult implements Parcelable {
     public String toString() {
         String out = new String();
         out += "\nsignatureStatus: " + signatureStatus;
-        out += "signatureUserId: " + signatureUserId;
+        out += "\nsignatureUserId: " + signatureUserId;
         out += "\nsignatureOnly: " + signatureOnly;
         return out;
     }
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 9e474271c..1c9966de3 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -44,7 +44,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="18" />
 
     <uses-feature
         android:name="android.hardware.wifi"
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index a8523a6c8..5d55d1ea5 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -14,10 +14,13 @@ repositories {
     mavenCentral()
 }
 
+/*
+ * NOTE: Avoid dependencies from Maven. Include as much sources as possible for F-Droid!
+ */
 dependencies {
     compile fileTree(dir: 'libs', includes: ['*.jar'], excludes: ['android-support-v4.jar'])
-    //compile 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.+@aar'
+    compile 'com.android.support:support-v4:18.0.+' // already in actionbarsherlock
+    compile project(':libraries:ActionBarSherlock')
     compile project(':libraries:HtmlTextView')
 }
 
@@ -27,7 +30,7 @@ android {
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 17
+        targetSdkVersion 18
     }
 
     sourceSets {
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
index 2ad34628b..084aff4b6 100644
--- a/OpenPGP-Keychain/project.properties
+++ b/OpenPGP-Keychain/project.properties
@@ -8,6 +8,6 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-18
 android.library.reference.1=../libraries/ActionBarSherlock
 android.library.reference.2=../libraries/HtmlTextView
diff --git a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index f0528572d..a84d026bf 100644
--- a/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/OpenPGP-Keychain/src/org/openintents/openpgp/OpenPgpSignatureResult.java
@@ -84,7 +84,7 @@ public class OpenPgpSignatureResult implements Parcelable {
     public String toString() {
         String out = new String();
         out += "\nsignatureStatus: " + signatureStatus;
-        out += "signatureUserId: " + signatureUserId;
+        out += "\nsignatureUserId: " + signatureUserId;
         out += "\nsignatureOnly: " + signatureOnly;
         return out;
     }