diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index c1bcf4e..5112c32 100644
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -28,4 +28,4 @@ else
 	. "$HOME/.xprofile"
 fi
 
-exec dwm
+exec /usr/bin/dbus-launch --sh-syntax --exit-with-session dwm
diff --git a/.config/X11/xprofile b/.config/X11/xprofile
index f1c5353..71069e1 100644
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@@ -3,6 +3,7 @@
 # This file is sourced when launching a DM from startx/xinit
 
 # session launch
+eval $(dbus-launch --sh-syntax --exit-with-session)
 
 xss-lock -- slock &
 redshift &
diff --git a/.config/gnupg/gpg-agent.conf b/.config/gnupg/gpg-agent.conf
index 52cbff2..8c29806 100644
--- a/.config/gnupg/gpg-agent.conf
+++ b/.config/gnupg/gpg-agent.conf
@@ -1,3 +1,5 @@
 allow-preset-passphrase
 default-cache-ttl 604800
 max-cache-ttl 604800
+
+pinentry-program /usr/bin/pinentry
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 7588c43..6b444b6 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -3,6 +3,7 @@
 
 # Reset tty for gpg
 export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
 
 # Enable colors and change prompt:
 autoload -U colors && colors