--- gnupg-2.2.27.orig/agent/call-pinentry.c
+++ gnupg-2.2.27/agent/call-pinentry.c
@@ -202,13 +202,14 @@
 
   while ((name = session_env_list_stdenvnames (&iterator, &assname)))
     {
-      /* For all new envvars (!ASSNAME) and the two medium old ones
+      /* For all new envvars (!ASSNAME) and the few medium old ones
        * which do have an assuan name but are conveyed using
        * environment variables, update the environment of the forked
        * process.  */
       if (!assname
           || !strcmp (name, "XAUTHORITY")
-          || !strcmp (name, "PINENTRY_USER_DATA"))
+          || !strcmp (name, "PINENTRY_USER_DATA")
+          || (!opt.keep_display && !strcmp (name, "DISPLAY")))
         {
           value = session_env_getenv (ctrl->session_env, name);
           if (value)

diff --git a/qt/main.cpp b/qt/main.cpp
index d2f0684..26f2036 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -398,6 +398,13 @@ main(int argc, char *argv[])
         }
         for (done = 0, p = *new_argv, i = 0; i < argc; i++)
             if (!done && !strcmp(argv[i], "--display")) {
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
+                /* Force DISPLAY to the same value as --display, as
+                 * libqgtk3 relies on the environment variable. */
+                if (i < argc - 1) {
+                    qputenv("DISPLAY", argv[i+1]);
+                }
+#endif
                 new_argv[i] = strcpy(p, argv[i] + 1);
                 p += strlen(argv[i] + 1) + 1;
                 done = 1;