diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 9eba9d3f8ecd..7e9746b5245f 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,60 +1,61 @@
 # Created by: ache
 
 PORTNAME=	lynx
-PORTVERSION=	2.9.0d6
+PORTVERSION=	2.9.0d9
 CATEGORIES=	www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
-		ftp://invisible-island.net/lynx/tarballs/
+		ftp://ftp.invisible-island.net/lynx/tarballs/
+
 PKGNAMESUFFIX=	-current
 DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Console-based web browser (current/development version)
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
 CONFLICTS_INSTALL=	lynx-2.8* ja-lynx-[0-9]*
 
 USES=		cpe iconv ncurses shebangfix tar:bzip2
 WRKSRC=		${WRKDIR}/${DISTNAME}
 CPE_VERSION=	${PORTVERSION:C/[pd].+//}
 CPE_UPDATE=	${PORTVERSION:E:C/[0-9]+//:S/p/pre./:S/d/dev./}
 SHEBANG_FILES=	samples/mailto-form.pl
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${PREFIX}/etc" \
 		--with-bzlib --with-zlib \
 		--with-mime-libdir=${PREFIX}/etc \
 		--with-screen=${NCURSES_IMPL} \
 		--enable-default-colors \
 		--enable-gzip-help \
 		--enable-ipv6 \
 		--enable-nested-tables \
 		--enable-nsl-fork \
 		${ICONV_CONFIGURE_ARGS}
 
 MAKE_FLAGS=	helpdir="${PREFIX}/share/lynx_help" docdir="${DOCSDIR}"
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 
 DOCSDIR=	${PREFIX}/share/doc/lynx
 
 OPTIONS_DEFINE=	DOCS GNUTLS IDN NLS
 OPTIONS_DEFAULT=IDN
 OPTIONS_SUB=	yes
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls --without-ssl
 GNUTLS_CONFIGURE_OFF=	--with-ssl=${OPENSSLBASE} --without-gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES_OFF=	ssl
 
 IDN_CONFIGURE_ENABLE=	idna
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 .include <bsd.port.mk>
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 50e721bd581e..1ab218f1bc0d 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1605020628
-SHA256 (lynx2.9.0dev.6.tar.bz2) = 78f0be7f81f4b84d8d33b45a05145f015e35355109be350e461de5c03abf53b2
-SIZE (lynx2.9.0dev.6.tar.bz2) = 2730690
+SHA256 (lynx2.9.0dev.9.tar.bz2) = 6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+SIZE (lynx2.9.0dev.9.tar.bz2) = 2746988
diff --git a/www/lynx-current/files/patch-makefile.in b/www/lynx-current/files/patch-makefile.in
index 878e2fa37243..eb7da39b5351 100644
--- a/www/lynx-current/files/patch-makefile.in
+++ b/www/lynx-current/files/patch-makefile.in
@@ -1,61 +1,62 @@
---- makefile.in.orig	2019-08-26 20:21:48 UTC
-+++ makefile.in
-@@ -324,7 +324,7 @@ install-doc : $(DOCDIR) $(HELPDIR)
+--- makefile.in.orig	2021-08-01 20:50:51.000000000 +0200
++++ makefile.in	2021-08-13 17:31:19.742347000 +0200
+@@ -325,7 +325,7 @@
  		cd $(HELPDIR) && rm -f $$name ;\
  		r= ;\
  		test "$(LN_S)" = "ln -s" || r=`echo $(helpdir)|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \
 -		cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . || cp $(DOCDIR)/$$name . );\
 +		cd $(HELPDIR) && ( $(LN_S) ../doc/lynx/$$name . || cp $(DOCDIR)/$$name . );\
- 		done'
- 	-$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac'
- 
-@@ -393,14 +393,10 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $
+ 		done';\
+ 	$(SHELL) -c 'set -x; \
+ 		case `id|sed -e "s/(.*//"` in \
+@@ -403,14 +403,10 @@
  		if test "$(COMPRESS_PROG)" != "" ; then \
  			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
  		fi'
--	@echo Updating $(sysconfdir)/lynx.cfg
+-	@echo "Updating $(sysconfdir)/lynx.cfg"
 -	@ECHO_CC@$(SHELL) -c \
 -	'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
 -		mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 -	else \
 -		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 -	fi'
--	@echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files
-+	@echo Updating $(sysconfdir)/lynx.cfg.sample
+-	@echo "Updating $(sysconfdir)/lynx.cfg to point to installed help-files"
++	@echo "Updating $(sysconfdir)/lynx.cfg.sample"
 +	cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp
 +	rm -f $(SYSCONFDIR)/lynx.cfg.sample
-+	@echo Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files
++	@echo "Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files"
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
  		-e '/^#HELPFILE:file/s!#!!' \
  		$(SYSCONFDIR)/lynx.tmp | \
-@@ -408,8 +404,8 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $
+@@ -418,8 +414,8 @@
  	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
  	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
  		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
--		>$(SYSCONFDIR)/lynx.cfg
--	chmod 644 $(SYSCONFDIR)/lynx.cfg
-+		>$(SYSCONFDIR)/lynx.cfg.sample
-+	chmod 644 $(SYSCONFDIR)/lynx.cfg.sample
- 	-rm -f $(SYSCONFDIR)/lynx.tmp
+-		>$(SYSCONFDIR)/lynx.cfg ;\
+-	chmod 644 $(SYSCONFDIR)/lynx.cfg ;\
++		>$(SYSCONFDIR)/lynx.cfg.sample; \
++	chmod 644 $(SYSCONFDIR)/lynx.cfg.sample; \
+ 	rm -f $(SYSCONFDIR)/lynx.tmp
  
  LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
-@@ -432,17 +428,15 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh $(scripts_dir)
+@@ -442,17 +438,15 @@
  	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
  
  install-cfg : $(SYSCONFDIR)
 -	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg
 +	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.sample
  
  install-lss : $(SYSCONFDIR)
 -	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
 +	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample
  
  uninstall ::
- @MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) uninstall
- 	-rm -f $(BINDIR)/$(binary_PROG)
- 	-rm -f $(MANDIR)/$(actual_PROG).1
--	-rm -f $(SYSCONFDIR)/lynx.cfg
--	-rm -f $(SYSCONFDIR)/lynx.lss
+ @MSG_DIR_MAKE@	( cd $(PO_DIR) && $(MAKE_RECUR) uninstall )
+ 	-rm -f $(BINDIR)/$(binary_PROG) ;\
+-	rm -f $(MANDIR)/$(actual_PROG).1 ;\
+-	rm -f $(SYSCONFDIR)/lynx.cfg ;\
+-	rm -f $(SYSCONFDIR)/lynx.lss
++	rm -f $(MANDIR)/$(actual_PROG).1
  
  uninstall \
  uninstall-help ::
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index b04edc0b4c03..39b0e8f4e170 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -1,143 +1,144 @@
 bin/lynx
 man/man1/lynx.1.gz
 @sample etc/lynx.cfg.sample
 @sample etc/lynx.lss.sample
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYHEADER
 %%PORTDOCS%%%%DOCSDIR%%/COPYHEADER.asc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.asc
 %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.4.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/CRAWL.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/FM.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.cookies
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.defines
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.options
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.release
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
 %%PORTDOCS%%%%DOCSDIR%%/docs/SOCKETSHR.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce.gz
 %%PORTDOCS%%%%DOCSDIR%%/samples/blue-background.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
 %%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
 %%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
 %%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
 %%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
 %%PORTDOCS%%%%DOCSDIR%%/samples/jumpsVMS.html
 %%PORTDOCS%%%%DOCSDIR%%/samples/keepviewer
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx-demo.cfg
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.ico
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump
 %%PORTDOCS%%%%DOCSDIR%%/samples/mailcap
 %%PORTDOCS%%%%DOCSDIR%%/samples/mailto-form.pl
 %%PORTDOCS%%%%DOCSDIR%%/samples/midnight.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
 %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
 %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat
 %%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
 %%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
 %%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
 %%PORTDOCS%%%%DOCSDIR%%/test/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
 %%PORTDOCS%%%%DOCSDIR%%/test/X
 %%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
 %%PORTDOCS%%%%DOCSDIR%%/test/c1.html
 %%PORTDOCS%%%%DOCSDIR%%/test/circle.html
 %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
 %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/image.jpg
+%%PORTDOCS%%%%DOCSDIR%%/test/idna-tr46.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
 %%PORTDOCS%%%%DOCSDIR%%/test/nobody
 %%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
 %%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
 %%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
 %%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
 %%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
 %%PORTDOCS%%%%DOCSDIR%%/test/square.html
 %%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
 %%PORTDOCS%%%%DOCSDIR%%/test/tags.html
 %%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
 %%PORTDOCS%%%%DOCSDIR%%/test/triangle.html
 %%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
 %%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
 %%NLS%%share/locale/ca/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/da/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/en/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/et/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/id/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lynx.mo
 share/lynx_help/COPYHEADER
 share/lynx_help/COPYING
 share/lynx_help/Lynx_users_guide.html.gz
 share/lynx_help/about_lynx.html.gz
 share/lynx_help/keystrokes/alt_edit_help.html.gz
 share/lynx_help/keystrokes/bashlike_edit_help.html.gz
 share/lynx_help/keystrokes/bookmark_help.html.gz
 share/lynx_help/keystrokes/cookie_help.html.gz
 share/lynx_help/keystrokes/dired_help.html.gz
 share/lynx_help/keystrokes/edit_help.html.gz
 share/lynx_help/keystrokes/environments.html.gz
 share/lynx_help/keystrokes/follow_help.html.gz
 share/lynx_help/keystrokes/gopher_types_help.html.gz
 share/lynx_help/keystrokes/history_help.html.gz
 share/lynx_help/keystrokes/keystroke_help.html.gz
 share/lynx_help/keystrokes/movement_help.html.gz
 share/lynx_help/keystrokes/option_help.html.gz
 share/lynx_help/keystrokes/other_help.html.gz
 share/lynx_help/keystrokes/print_help.html.gz
 share/lynx_help/keystrokes/scrolling_help.html.gz
 share/lynx_help/keystrokes/test_display.html.gz
 share/lynx_help/keystrokes/visited_help.html.gz
 share/lynx_help/keystrokes/xterm_help.html.gz
 share/lynx_help/lynx-dev.html.gz
 share/lynx_help/lynx_help_main.html.gz
 share/lynx_help/lynx_url_support.html.gz