diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 9244574b..231d0a85 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -591,6 +591,8 @@ append_gpg() {
 
     print_info 1 "Including GPG support"
     copy_binaries "${TEMP}/initramfs-gpg-temp" /usr/bin/gpg
+    [[ -e "/usr/bin/gpg-agent" ]] \
+	    && copy_binaries "${TEMP}/initramfs-gpg-temp" /usr/bin/gpg-agent
 
     cd "${TEMP}/initramfs-gpg-temp/"
     log_future_cpio_content