2 files changed, 8 insertions, 2 deletions

diff --git a/clientloop.c b/clientloop.c
index c9176c0d7..6a35c8e3e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1505,8 +1505,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                 exit_status = 0;
         }
 
-        if (received_signal)
-                fatal("Killed by signal %d.", (int) received_signal);
+        if (received_signal) {
+                debug("Killed by signal %d.", (int) received_signal);
+                cleanup_exit((int) received_signal + 128);
+        }
 
         /*
          * In interactive mode (with pseudo tty) display a message indicating
diff --git a/debian/changelog b/debian/changelog
index f6a78859e..68e6123f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ openssh (1:4.2p1-6) UNRELEASED; urgency=low
 
   * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
     to the normal and superuser paths and /usr/games to the normal path.
+  * When the client receives a signal, don't fatal() with "Killed by signal
+    %d." (which produces unhelpful noise on stderr and causes confusion for
+    users of some applications that wrap ssh); instead, generate a debug
+    message and exit with the traditional status (closes: #313371).
   * debconf template translations:
     - Add Swedish (thanks, Daniel Nylander; closes: #333133).