diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index f98d821ae..63f4ba2c8 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1197,11 +1197,11 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  es_printf ("setenv %s\n", infostr);
+                  es_printf ("setenv %s;\n", infostr);
 		  if (opt.ssh_support)
 		    {
 		      *strchr (infostr_ssh_sock, '=') = ' ';
-		      es_printf ("setenv %s\n", infostr_ssh_sock);
+		      es_printf ("setenv %s;\n", infostr_ssh_sock);
 		    }
                 }
               else
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 128ecc31d..6f8d01049 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -843,7 +843,7 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  es_printf ( "setenv %s\n", infostr);
+                  es_printf ( "setenv %s;\n", infostr);
                 }
               else
                 {