diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 07d38c228578..204e51745099 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -17,12 +17,10 @@ DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
-FORBIDDEN=  "Riddled with buffer overflows exploitable by a malicious server to execute code as the local user."
-
 WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
 
-VERSION=	2.8.3
-MINOR_VERSION=	dev.16
+VERSION=	2.8.4
+MINOR_VERSION=	dev.4
 
 USE_BZIP2=	YES
 NO_LATEST_LINK=	YES
@@ -33,9 +31,12 @@ CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-cjk --enable-file-upload --enable-justify-elts \
 		--enable-libjs --enable-read-eta --enable-source-cache
+.if (WITH_LYNX_EXPERIMENTAL_OPTS)
 # experimental optional configure args
-#   --enable-prettysrc --enable-color-style
-#
+CONFIGURE_ARGS+=	--enable-prettysrc --enable-color-style \
+			--enable-addrlist-page --enable-charset-choice \
+			--enable-htmlized-cfg
+.endif
 MAKEFILE=	makefile
 MAKE_ARGS=	helpdir=${PREFIX}/${LYNX_HELP} docdir=${PREFIX}/${LYNX_DOC}
 PLIST_SUB=	LYNX_LIB=${LYNX_LIB} LYNX_DOC=${LYNX_DOC} LYNX_HELP=${LYNX_HELP}
diff --git a/japanese/lynx-current/distinfo b/japanese/lynx-current/distinfo
index 7d047958857a..ffa1782dec5a 100644
--- a/japanese/lynx-current/distinfo
+++ b/japanese/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.3dev.16.tar.bz2) = c5c2a50a5b14d3c779d0668af0e052be
+MD5 (lynx2.8.4dev.4.tar.bz2) = ce6fbf3f89bab22f1936a8c1f2e4c961