diff --git a/package/shellinabox/0003-cr-lf-problem-android.patch b/package/shellinabox/0003-cr-lf-problem-android.patch
new file mode 100644
index 0000000000..6c986a33c4
--- /dev/null
+++ b/package/shellinabox/0003-cr-lf-problem-android.patch
@@ -0,0 +1,16 @@
+diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
+index fe31cb5..5924871 100755
+--- a/shellinabox/vt100.jspp
++++ b/shellinabox/vt100.jspp
+@@ -916,8 +916,9 @@ VT100.prototype.initializeElements = function(container) {
+                        '<div class="hidden">' +
+                          '<div id="usercss"></div>' +
+                          '<pre><div><span id="space"></span></div></pre>' +
+-                         '<input type="text" id="input" autocorrect="off" autocapitalize="off" />' +
+-                         '<input type="text" id="cliphelper" />' +
++                         '<input type="text" id="input" autocorrect="off" autocapitalize="off" ' +
++                                'autocomplete="off" spellcheck="false" />' +
++                         '<input type="text" id="cliphelper" tabindex="-1" />' +
+                          (typeof suppressAllAudio != 'undefined' &&
+                           suppressAllAudio ? "" :
+                          embed + '<bgsound id="beep_bgsound" loop=1 />') +
diff --git a/package/shellinabox/0004-remove-some-auth-modules-from-ssh.patch b/package/shellinabox/0004-remove-some-auth-modules-from-ssh.patch
new file mode 100644
index 0000000000..39cd922f69
--- /dev/null
+++ b/package/shellinabox/0004-remove-some-auth-modules-from-ssh.patch
@@ -0,0 +1,20 @@
+diff --git a/shellinabox/service.c b/shellinabox/service.c
+index cdf946e..f1609f8 100644
+--- a/shellinabox/service.c
++++ b/shellinabox/service.c
+@@ -171,12 +171,12 @@ void initService(struct Service *service, const char *arg) {
+     service->cmdline                        = stringPrintf(NULL,
+       "ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no "
+           "-oCheckHostIP=no -oClearAllForwardings=yes -oCompression=no "
+-          "-oControlMaster=no -oGSSAPIAuthentication=no "
++          "-oControlMaster=no "
+           "-oHostbasedAuthentication=no -oIdentitiesOnly=yes "
+           "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes "
+           "-oPreferredAuthentications=keyboard-interactive,password "
+-          "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no "
+-          "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
++          "-oPubkeyAuthentication=no "
++          "-oStrictHostKeyChecking=no -oTunnel=no "
+           "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no "
+ // beewoolie-2012.03.30: while it would be nice to disable this
+ //          feature, we cannot be sure that it is available on the