diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
index fb7f5c1a58ed..c414a708bec3 100644
--- a/www/shellinabox/Makefile
+++ b/www/shellinabox/Makefile
@@ -1,52 +1,52 @@
 # Created by: Olivier Cochard-Labbe <olivier@FreeBSD.org>
 
 PORTNAME=	shellinabox
 PORTVERSION=	2.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Publish command line shell through AJAX interface
 
 LICENSE=	GPLv2
 
 USES=	autoreconf libtool ssl
 
 OPTIONS_DEFINE=	CORES NOLOGIN
 CORES_DESC=	Patch shellinaboxd to enable core dumps
 NOLOGIN_DESC=	Login through ssh (not through login)
 
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	shellinaboxd
 USERS?=		shellinabox
 GROUPS?=	shellinabox
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 
 CONFIGURE_ARGS=	--disable-runtime-loading --disable-pam \
 		CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 
 NOLOGIN_CONFIGURE_ON=	--disable-login
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MCORES}
 	@${REINPLACE_CMD} \
 		-e 's|prctl(PR_SET_DUMPABLE,|// &|' \
 		-e 's|setrlimit(RLIMIT_CORE,|// &|' \
 			${WRKSRC}/shellinabox/shellinaboxd.c
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/www/shellinabox/files/patch-shellinabox_service.c b/www/shellinabox/files/patch-shellinabox_service.c
index 30c91ccb436c..fd708ab9df11 100644
--- a/www/shellinabox/files/patch-shellinabox_service.c
+++ b/www/shellinabox/files/patch-shellinabox_service.c
@@ -1,12 +1,20 @@
---- shellinabox/service.c.orig
+--- shellinabox/service.c.orig	2016-11-09 19:40:33 UTC
 +++ shellinabox/service.c
-@@ -175,8 +175,7 @@ void initService(struct Service *service, const char *
+@@ -169,14 +169,13 @@ void initService(struct Service *service, const char *
+     }
+ 
+     service->cmdline                        = stringPrintf(NULL,
+-      "ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no "
++      "ssh -a -e none -i /dev/null -x "
+           "-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