diff --git a/net-im/sshout/Makefile b/net-im/sshout/Makefile
index 787578caea61..8a5ec7456b7a 100644
--- a/net-im/sshout/Makefile
+++ b/net-im/sshout/Makefile
@@ -1,50 +1,53 @@
 PORTNAME=	sshout
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sshout/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	msl0000023508@gmail.com
 COMMENT=	Instant-messaging service based on SSH
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmhash.so:security/mhash
 
 USES=		tar:bz2 gmake readline
 
 NO_WRKSUBDIR=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	LIBEXECDIR=\${PREFIX}/libexec \
 		MANDIR=\${PREFIX}/man
 
 USE_RC_SUBR=	sshout
 
 USERS=		sshout
 GROUPS=		sshout
 
 OPTIONS_DEFINE=		NLS IRC
 OPTIONS_DEFAULT=	NLS
 OPTIONS_GROUP=		SUGGESTED
-OPTIONS_GROUP_SUGGESTED=XCLIP
+OPTIONS_GROUP_SUGGESTED=XCLIP ELINKS
 
 SUGGESTED_DESC=		Suggested ports
+
 XCLIP_DESC=		Add dependency to xclip(1) for CLI pasteimage support
+XCLIP_RUN_DEPENDS=	xclip:x11/xclip
+ELINKS_DESC=		Add dependency to elinks(1) for showing HTML messages in CLI
+ELINKS_RUN_DEPENDS=	elinks>=0.12:www/elinks
+
 NLS_USES=		gettext
 NLS_MAKE_ENV=		NLS_LIBS="-l intl"
 NLS_MAKE_ENV_OFF=	NO_NLS=1
+
 IRC_DESC=		Experimental IRC over SSH frontend
 IRC_CPPFLAGS=		-D ENABLE_IRC_FRONTEND=1
 
 OPTIONS_SUB=		yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MXCLIP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/xclip:x11/xclip
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-im/sshout/files/patch-Makefile b/net-im/sshout/files/patch-Makefile
new file mode 100644
index 000000000000..0cb7636ea882
--- /dev/null
+++ b/net-im/sshout/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2020-09-01 11:34:08 UTC
++++ Makefile
+@@ -4,7 +4,7 @@
+ INSTALL ?= install
+ MSGFMT ?= msgfmt
+ 
+-CFLAGS += -Wall -Wno-switch -Wno-pointer-to-int-cast -O1
++CFLAGS += -Wall -Wno-switch -Wno-pointer-to-int-cast
+ #LIBS += 
+ 
+ #SOCKET_LIBS := -l socket
diff --git a/net-im/sshout/pkg-message b/net-im/sshout/pkg-message
index 454cb7bc8b69..322176dbe53f 100644
--- a/net-im/sshout/pkg-message
+++ b/net-im/sshout/pkg-message
@@ -1,13 +1,12 @@
 #### NOTES OF SSHOUT
 In order to start sshout service you need some more configuration:
 
 # sysrc -f /etc/rc.conf sshout_enable="YES"
 
 If you installed SSHOUT for the first time, use sshoutcfg(8) to add users.
 You must have SSH server running and accepting public key authentication.
 
-For HTML messages be properly displayed in CLI frontend, elinks(1) version
-0.12 or later is required; however the ports tree currently doesn't have an
-up-to-date elinks version available. You will have to install the required
-version manually, if such support is needed.
+Suggested ports:
+x11/xclip	For '/pasteimage' command to work in CLI frontend
+www/elinks	For HTML messages be properly displayed in CLI frontend
 #### END