diff --git a/INSTALL.md b/INSTALL.md
index d3927536f..9ecaf83f7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -26,7 +26,9 @@ The following libraries are required:
 * libmicrohttpd
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
-* libargon2
+* argon2
+* qrencode
+* yubikey ykpers (optional to support YubiKey)
 
 Prepare the Building Environment
 ================================
diff --git a/src/cli/Utils.cpp b/src/cli/Utils.cpp
index 06d2bcf23..749f7ff20 100644
--- a/src/cli/Utils.cpp
+++ b/src/cli/Utils.cpp
@@ -163,7 +163,7 @@ namespace Utils
             return password;
         }
 
-        TextStream in(STDIN, QIODevice::ReadOnly);
+        static TextStream in(STDIN, QIODevice::ReadOnly);
 
         setStdinEcho(false);
         QString line = in.readLine();
diff --git a/src/main.cpp b/src/main.cpp
index e975a6b9c..685a7a15c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -144,8 +144,7 @@ int main(int argc, char** argv)
         if (pwstdin) {
             // we always need consume a line of STDIN if --pw-stdin is set to clear out the
             // buffer for native messaging, even if the specified file does not exist
-            static QTextStream in(stdin, QIODevice::ReadOnly);
-            static QTextStream out(stdout, QIODevice::WriteOnly);
+            QTextStream out(stdout, QIODevice::WriteOnly);
             out << QObject::tr("Database password: ") << flush;
             password = Utils::getPassword();
         }
diff --git a/utils/keepassx-kwallet b/utils/keepassxc-kdewallet
similarity index 62%
rename from utils/keepassx-kwallet
rename to utils/keepassxc-kdewallet
index e0cdcda5e..90a3eb73d 100755
--- a/utils/keepassx-kwallet
+++ b/utils/keepassxc-kdewallet
@@ -1,9 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# fetch KeePass database passwords from kdewallet
 
 ### change the path to suit your installation or set KDBX_SEARCH before calling ###
 : ${KDBX_SEARCH:=~/.KeePass/*.kdbx}
 
-PROG="$(basename $0)"
+PROG="${0##*/}"
+KEEPASSXC=$(which -a keepassxc | sed -e "\\,$0,d" -e 'q')
 
 function daemon_main {
   # open kdewallet
@@ -12,16 +14,14 @@ function daemon_main {
     sleep 1
   done
 
-  # fetch KeePass database passwords from kdewallet
   declare -A DBs
-  for DBPATH in $KDBX_SEARCH; do
-    [[ -L "$DBPATH" ]] && DBPATH=$(readlink --canonicalize "$DBPATH")
-    DBs[$DBPATH]=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.readPassword "$handle" "Passwords" "$DBPATH" "$PROG")
+  for DBPATH in $(ls -r $KDBX_SEARCH); do
+    DBs[$(realpath $DBPATH)]=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.readPassword "$handle" "Passwords" "${DBPATH##*/}" "$PROG")
   done
 
-  # launch keepassx
+  # launch real keepassxc
   IFS=$'\n\n\n'
-  keepassx --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" &
+  "$KEEPASSXC" --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" &
 
   # done with kdewallet
   qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.close "$handle" "false" "$PROG"
diff --git a/utils/keepassxc-keychain b/utils/keepassxc-keychain
new file mode 100755
index 000000000..625380d37
--- /dev/null
+++ b/utils/keepassxc-keychain
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# fetch KeePass database passwords from keychain
+
+### change the path to suit your installation or set KDBX_SEARCH before calling ###
+: ${KDBX_SEARCH:=~/.KeePass/*.kdbx}
+
+PROG="$(basename $0)"
+KeePassXC=$(ls -f {/usr/local,/Applications}/KeePassXC.app/Contents/MacOS/KeePassXC 2>/dev/null | head -1)
+
+function daemon_main {
+  declare -A DBs
+  for DBPATH in $KDBX_SEARCH; do
+    DBs[$(python -c  "import os; print os.path.realpath('$DBPATH')")]=$(security find-generic-password -a $USER -s "${DBPATH##*/}" -w)
+  done
+
+  # launch keepassxc
+  IFS=$'\n\n\n'
+  $KeePassXC --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" &
+}
+
+if [[ '-d' = "$1" ]]; then
+  exec >&~/tmp/$PROG.log
+  set -vx
+  daemon_main
+else
+  cd /
+  daemon_main </dev/null >&/dev/null &
+  disown
+fi