diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index f12f73ceb..b00d899d0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1175,13 +1175,13 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  printf ("setenv %s\n", infostr);
+                  printf ("setenv %s;\n", infostr);
 		  if (opt.ssh_support)
 		    {
 		      *strchr (infostr_ssh_sock, '=') = ' ';
-		      printf ("setenv %s\n", infostr_ssh_sock);
+		      printf ("setenv %s;\n", infostr_ssh_sock);
 		      *strchr (infostr_ssh_pid, '=') = ' ';
-		      printf ("setenv %s\n", infostr_ssh_pid);
+		      printf ("setenv %s;\n", infostr_ssh_pid);
 		    }
                 }
               else
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 95f657065..064d3424c 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -828,7 +828,7 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  printf ( "setenv %s\n", infostr);
+                  printf ( "setenv %s;\n", infostr);
                 }
               else
                 {