diff --git a/kube/gpgme.json b/kube/gpgme.json
index b00fd8a..820c649 100644
--- a/kube/gpgme.json
+++ b/kube/gpgme.json
@@ -1,36 +1,47 @@
 {
     "name": "gpgme",
     "sources": [ { "type": "git", "url": "git://git.gnupg.org/gpgme.git", "branch": "gpgme-1.9.0"} ],
     "modules": [
         {
             "name": "libgpg-error",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.22.tar.bz2",
                     "sha256": "f2a04ee6317bdb41a625bea23fdc7f0b5a63fb677f02447c647ed61fb9e69d7b"
                 }
             ],
             "cleanup": [
                 "/lib/libgpg-error.la"
             ]
         },
         {
             "name": "libassuan",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.4.2.tar.bz2",
                     "sha256": "bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20"
                 }
             ],
             "cleanup": [
                 "/lib/libassuan.la"
             ]
+        },
+        {
+            "name": "pinentry",
+            "config-opts": ["-enable-pinentry-qt"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2",
+                    "sha256": "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
+                }
+            ]
         }
     ],
     "cleanup": [
         "/lib/libgpgme*.la",
         "/lib/libqgpgme.la"
     ]
 }
diff --git a/kube/org.kolab.kube.json b/kube/org.kolab.kube.json
index 9b571aa..b1e2c25 100644
--- a/kube/org.kolab.kube.json
+++ b/kube/org.kolab.kube.json
@@ -1,43 +1,57 @@
 {
     "id": "org.kolab.kube",
     "branch": "master",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
-    "command": "kube",
+    "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
     "rename-desktop-file": "org.kde.kube.desktop",
     "desktop-file-name-prefix": "(Nightly) ",
     "tags": ["nightly"],
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
         "--env=SASL_PATH=/usr/lib/sasl2/"
     ],
     "separate-locales": false,
 
     "modules": [
         "kubedeps.json",
         {
             "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
             "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"],
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ],
             "post-install": [
                 "rm -rf /app/include",
                 "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl "
+        },
+        {
+            "name": "kubewrapper",
+            "buildsystem": "simple",
+            "build-commands": [
+                "cp kubewrapper.sh /app/bin/kubewrapper.sh",
+                "chmod +x /app/bin/kubewrapper.sh"
+            ],
+            "sources": [
+                {
+                    "type": "script",
+                    "commands": ["gpg-agent --homedir ~/.gnupg/ --daemon --pinentry-program /app/bin/pinentry-qt", "kube"],
+                    "dest-filename": "kubewrapper.sh"
+                }
             ]
         }
     ]
 }