diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 4ff9a066ba88..2365c6fb3d1f 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,105 +1,111 @@
 # Created by: Michael Vasilenko <acid@stu.cn.ua>
 
 PORTNAME=	elinks
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.0
 CATEGORIES=	www
 
 MAINTAINER=	jailbird@fdf.net
 COMMENT=	Links text WWW browser with enhancements
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf bison:alias cpe gmake pkgconfig ssl
-CONFIGURE_ARGS=	--without-zlib
+USES=		autoreconf bison:alias cpe gmake iconv pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rkd77
 
 LIBS+=		-lexecinfo
 
-OPTIONS_DEFINE=		88COLORS 256COLORS SPIDERMONKEY XBELMARKS LOCAL_CGI \
-			FINGER GOPHER BITTORRENT NNTP FTP FSP SMB EXMODE \
-			HIGHLIGHT IDN NOROOT FASTMEM PERL \
-			LUA GUILE ICONV MOUSE NLS
-OPTIONS_DEFAULT=	88COLORS 256COLORS FTP EXMODE HIGHLIGHT FASTMEM MOUSE
+OPTIONS_DEFINE=		256COLORS 88COLORS BITTORRENT BROTLI EXMODE \
+			FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \
+			IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \
+			PERL SMB SPIDERMONKEY XBELMARKS ZSTD
+OPTIONS_DEFAULT=	256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \
+			HIGHLIGHT LZMA MOUSE
 OPTIONS_SUB=		yes
 
 88COLORS_DESC=		88 color support
 256COLORS_DESC=		256 color support
 SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
 XBELMARKS_DESC=		XBEL bookmarks (via expat)
 LOCAL_CGI_DESC=		Local CGI support
 FSP_DESC=		FSP protocol support (via fsplib)
 EXMODE_DESC=		Exmode (CLI) support
 HIGHLIGHT_DESC=		HTML highlighting using DOM engine
 NOROOT_DESC=		Prevention of usage by root
 FASTMEM_DESC=		Fast memory allocation functions
 
+BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
+BROTLI_CONFIGURE_ON=	--with-brotli
+
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 GUILE_LIB_DEPENDS=	libguile-3.0.so:lang/guile
 GUILE_CONFIGURE_WITH=	guile
 
 LUA_USES=		lua
 LUA_CONFIGURE_ON=	--with-luapkg=lua-${LUA_VER}
 
+LZMA_CONFIGURE_ON=	--with-lzma
+
 PERL_USES=		perl5
 PERL_CONFIGURE_WITH=	perl
 
 FASTMEM_CONFIGURE_ON=	--enable-fastmem
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_USES=		localbase
 IDN_CONFIGURE_WITH=	idn
 
 NOROOT_CONFIGURE_ON=	--enable-no-root
 
 HIGHLIGHT_CONFIGURE_ON=	--enable-html-highlight
 
 EXMODE_CONFIGURE_ON=	--enable-exmode
 
 SMB_USES=		samba # smbclient
 SMB_CONFIGURE_ENABLE=	smb
 
 FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
 FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
 FSP_CONFIGURE_ENABLE=	fsp
 
 FTP_CONFIGURE_ENABLE=	ftp
 
 NNTP_CONFIGURE_ENABLE=	nntp
 
 BITTORRENT_CONFIGURE_ENABLE=	bittorrent
 
 GOPHER_CONFIGURE_ENABLE=	gopher
 
 MOUSE_CONFIGURE_ENABLE=	mouse
 
 FINGER_CONFIGURE_ENABLE=	finger
 
 LOCAL_CGI_CONFIGURE_ENABLE=	cgi
 
 XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
 XBELMARKS_CONFIGURE_OFF=--disable-xbel
 
 256COLORS_CONFIGURE_ON=	--enable-256-colors
 
 88COLORS_CONFIGURE_ON=	--enable-88-colors
 
 SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libjs.so:lang/spidermonkey17
 SPIDERMONKEY_RUN_DEPENDS=	js:lang/spidermonkey17
 SPIDERMONKEY_LIB_DEPENDS=	libnspr4.so:devel/nspr
 SPIDERMONKEY_CFLAGS=		-I${LOCALBASE}/include/nspr \
 				-I${LOCALBASE}/include/js-1.7
 SPIDERMONKEY_LDFLAGS=		-L${LOCALBASE}/lib -lnspr4 -lpthread -lm
 SPIDERMONKEY_CONFIGURE_ON=	--enable-sm-scripting --with-spidermonkey
 SPIDERMONKEY_CONFIGURE_OFF=	--disable-sm-scripting --without-spidermonkey
 
-ICONV_USES=		iconv
-ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+ZSTD_USES=		localbase
+ZSTD_CONFIGURE_ON=	--with-zstd
 
 .include <bsd.port.mk>
diff --git a/www/elinks/files/patch-configure.ac b/www/elinks/files/patch-configure.ac
index e7db5138422c..3c9bfe209491 100644
--- a/www/elinks/files/patch-configure.ac
+++ b/www/elinks/files/patch-configure.ac
@@ -1,11 +1,19 @@
---- configure.ac.orig	2022-01-29 19:43:50 UTC
+--- configure.ac.orig	2021-12-24 19:53:43 UTC
 +++ configure.ac
-@@ -1861,7 +1861,7 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
+@@ -531,6 +531,7 @@ else
+ 	if $PKG_CONFIG $pkg_config_static libbrotlidec; then
+ 		BROTLI_CFLAGS=`$PKG_CONFIG $pkg_config_static --cflags libbrotlidec`
+ 		BROTLI_LIBS=`$PKG_CONFIG $pkg_config_static --libs libbrotlidec`
++		CFLAGS="$BROTLI_CFLAGS $CFLAGS"
+ 		LIBS="$BROTLI_LIBS $LIBS"
+ 		CONFIG_BROTLI=yes
+ 		AC_DEFINE([CONFIG_BROTLI], [1], [Define as 1 to use the libbrotli library.])
+@@ -1861,7 +1862,7 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
        ;;
      10|10.*|11|11.*)
        # gettext
 -      CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Wno-array-bounds"
 +      CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-array-bounds"
        ;;
      *)
        # These should be ok using -Werror