diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index b9a07252a75b..a40fd2667ff6 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	lynx
-PORTVERSION=	2.8.9.1
+DISTVERSION=	2.8.9.1
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/ \
+MASTER_SITES=	https://invisible-mirror.net/archives/lynx/tarballs/ \
+		https://invisible-island.net/archives/lynx/tarballs/ \
 		http://bitrote.org/distfiles/
-DISTNAME=	${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E}
+DISTNAME=	${PORTNAME}${DISTVERSION:R}rel.${DISTVERSION:E}
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Non-graphical, text-based World-Wide Web client
 WWW=		https://lynx.invisible-island.net/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 CONFLICTS=	lynx-2.8.[8-9]d*
 
 USES=		cpe ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-zlib --libdir="${PREFIX}/etc" \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-nested-tables --enable-gzip-help \
 		--with-screen=ncursesw
-CPE_VERSION=	${PORTVERSION:R}
-CPE_UPDATE=	rel.${PORTVERSION:E}
+CPE_VERSION=	${DISTVERSION:R}
+CPE_UPDATE=	rel.${DISTVERSION:E}
 
 MAKEFILE=	makefile
 L_HELP=		${PREFIX}/share/lynx_help
 SUB_FILES=	pkg-message
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DEFAULT_COLORS IPV6 NLS SSL DOCS EXTERNALS
 OPTIONS_DEFAULT=	SSL EXTERNALS
 DEFAULT_COLORS_DESC=	Colors support
 EXTERNALS_DESC=	External application support
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 DEFAULT_COLORS_CONFIGURE_ENABLE=	default-colors
 
 DOCS_CONFIGURE_ENABLE=	local-docs
 DOCS_INSTALL_TARGET=	install-full
 DOCS_MAKE_ARGS=		helpdir=${L_HELP} docdir=${DOCSDIR}
 
 EXTERNALS_CONFIGURE_ENABLE=externs
 
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 post-install-DOCS-on:
 # Fix some stage symlinks
 .for doc in COPYHEADER COPYING COPYHEADER.asc COPYING.asc
 	(cd ${STAGEDIR}${L_HELP} && ${LN} -sf ../doc/lynx/${doc} .)
 .endfor
 
 .include <bsd.port.mk>