3 files changed, 5 insertions, 13 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index b25e0c9e37..32f7cc470b 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,22 +19,12 @@
 
 {"%VSN%",	
  [
- {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []},
-                {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
-  {<<"2.1.3">>, [{restart_application, ssh}]},
-  {<<"2.1.2">>, [{restart_application, ssh}]},
-  {<<"2.1.1">>, [{restart_application, ssh}]},
-  {<<"2.1">>, [{restart_application, ssh}]},
+  {<<"2.1\\.*">>, [{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ],
  [
-  {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []},
-                 {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
-  {<<"2.1.3">>, [{restart_application, ssh}]},
-  {<<"2.1.2">>, [{restart_application, ssh}]},
-  {<<"2.1.1">>, [{restart_application, ssh}]},
-  {<<"2.1">>,[{restart_application, ssh}]},
+  {<<"2.1\\.*">>,[{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ]
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 3a7aa79d16..7d5478c3f6 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -41,11 +41,13 @@
 %%--------------------------------------------------------------------
 start() ->
     application:start(crypto),
+    application:start(asn1),
     application:start(public_key),
     application:start(ssh).
 
 start(Type) ->
     application:start(crypto, Type),
+    application:start(asn1),
     application:start(public_key, Type),
     application:start(ssh, Type).
 
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index 93f9e20663..b299868d41 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in