3 files changed, 24 insertions, 4 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 9597137cdf..b3484a1e98 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,20 @@
     <file>notes.xml</file>
   </header>
 
+ <section><title>Ssh 1.1.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>The connection handler now include stack traces when a channel 
+             message is not handled correctly.</p>
+          <p>Own Id: OTP-8524 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+ </section>
+
  <section><title>Ssh 1.1.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 5329373862..1a1a4b1b8b 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,7 +19,9 @@
 
 {"%VSN%",	
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
@@ -27,7 +29,9 @@
   {"1.1.2", [{restart_application, ssh}]}
  ],
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index bc7bceeb24..5c6af2e621 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,11 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 1.1.8
+SSH_VSN = 1.1.9
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8356 \
+TICKETS = OTP-8524
+
+TICKETS_1.1.8 = OTP-8356 \
 	OTP-8401
 
 TICKETS_1.1.7 = OTP-8121 \