diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index 5610d9c..d78029d 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -30,6 +30,7 @@ public class AndroidHelper {
     private static native int nativeSetup(String debugflag);
 
     private static File homeDir;
+    public static File gnupgHomeDir;
     private static File optDir;
     private static File versionFile;
     public static File binDir;
@@ -77,7 +78,9 @@ public class AndroidHelper {
         // something like "/data/data/app.package.name/home"
         // pEpEngine use it to find management DB and gpg home
         homeDir = c.getDir("home", Context.MODE_PRIVATE);
+        gnupgHomeDir = new File(homeDir, ".gnupg");
         setenv("HOME", homeDir.getAbsolutePath(), true);
+        setenv("GNUPGHOME", gnupgHomeDir.getAbsolutePath(), true);
 
         // pEpEngine need to find the safe words database
         shareDir = c.getDir("trustwords", Context.MODE_PRIVATE);
diff --git a/android/src/org/pEp/jniadapter/GPGAgentService.java b/android/src/org/pEp/jniadapter/GPGAgentService.java
index 3949b84..4729671 100644
--- a/android/src/org/pEp/jniadapter/GPGAgentService.java
+++ b/android/src/org/pEp/jniadapter/GPGAgentService.java
@@ -25,8 +25,9 @@ public class GPGAgentService extends Service {
                     " --daemon" +
                     //" --write-env-file" +
                     //" --batch" + 
-                    " --debug-level basic --log-file "
-                    + new File(GPGAgentService.this.getFilesDir(), "gpg-agent.log")).waitFor();
+                    " --homedir " + AndroidHelper.gnupgHomeDir.getAbsolutePath() +
+                    " --debug-level basic --log-file " + 
+                    new File(GPGAgentService.this.getFilesDir(), "gpg-agent.log")).waitFor();
                 Log.i(TAG, "execution terminated");
             } catch (Exception e) {
                 Log.e(TAG, "could not execute process", e);