diff --git a/sysoptions.h b/sysoptions.h
index d01b4ea2c11666836b44e34c1e853a60632c79bd..385a903e8f958198c9e4933f39bed29fd873f48e 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -153,8 +153,7 @@
 #define MAX_CHANNELS 100 /* simple mem restriction, includes each tcp/x11
 							connection, so can't be _too_ small */
 
-#define MAX_STRING_LEN 1400 /* ~= MAX_PROPOSED_ALGO * MAX_NAME_LEN, also
-							   is the max length for a password etc */
+#define MAX_STRING_LEN 2400 /* Sun SSH needs this long for algos */
 
 /* For a 4096 bit DSS key, empirically determined */
 #define MAX_PUBKEY_SIZE 1700