diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 99ef7e006a69..9accbff18bba 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,67 +1,69 @@
 PORTNAME=	lynx
 DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/
 DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
 MAINTAINER=	CQG00620@nifty.ne.jp
 COMMENT=	Console WWW client (browser) with multi-byte encoding support
 WWW=		https://lynx.invisible-island.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 VERSION=	2.8.9
 MINOR_VERSION=	rel.1
 
 CONFLICTS=	lynx-2.* lynx-current-2.* ja-lynx-current-2.*
 
 USES=		cpe ncurses shebangfix tar:bzip2
 SHEBANG_FILES=	samples/mailto-form.pl
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=--with-screen=ncursesw --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-ipv6 \
 		--enable-cjk --enable-internal-links \
 		--with-bzlib
 MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 CPE_VERSION=	${PORTVERSION:R}
 CPE_UPDATE=	${PORTVERSION:E:S/r/rel./}
 
 L_LIB=		${PREFIX}/etc
 L_HELP=		${PREFIX}/share/lynx_help
 
 OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 IDN SSL
 OPTIONS_DEFAULT=JAPANESE_UTF8
 OPTIONS_SUB=	yes
 
 COLOR_STYLE_DESC=		Optional color style support
 COLOR_STYLE_CONFIGURE_ENABLE=	color-style
 
 DEFAULT_COLORS_DESC=		Default-color background support (ncurses)
 DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	idna
 
 JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic support
 JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
 JAPANESE_UTF8_USES=		iconv
 
 SSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 # Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
 # parallel builds
 post-patch:
 	@${REINPLACE_CMD} -E 's|cd (.+) && (\$$\(MAKE_RECUR\))|\2 -C \1|' \
 		${WRKSRC}/${MAKEFILE}.in
 
 post-install-DOCS-on:
 .for doc in COPYHEADER COPYING
 	${RLN} ${STAGEDIR}${DOCSDIR}/${doc} ${STAGEDIR}${L_HELP}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx/pkg-plist b/japanese/lynx/pkg-plist
index 0cc4cad60c42..393de6806c85 100644
--- a/japanese/lynx/pkg-plist
+++ b/japanese/lynx/pkg-plist
@@ -1,119 +1,119 @@
 bin/lynx
 @sample etc/lynx.cfg.sample
 %%COLOR_STYLE%%@sample etc/lynx.lss.sample
-man/man1/lynx.1.gz
+share/man/man1/lynx.1.gz
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.4
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.5
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.6
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.7
 %%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.8
 %%PORTDOCS%%%%DOCSDIR%%/docs/CRAWL.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/FM.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/IBMPC-charsets.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
 %%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
 %%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/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
 %%PORTDOCS%%share/lynx_help/COPYHEADER
 %%PORTDOCS%%share/lynx_help/COPYING
 share/lynx_help/Lynx_users_guide.html
 share/lynx_help/about_lynx.html
 share/lynx_help/keystrokes/alt_edit_help.html
 share/lynx_help/keystrokes/bashlike_edit_help.html
 share/lynx_help/keystrokes/bookmark_help.html
 share/lynx_help/keystrokes/cookie_help.html
 share/lynx_help/keystrokes/dired_help.html
 share/lynx_help/keystrokes/edit_help.html
 share/lynx_help/keystrokes/environments.html
 share/lynx_help/keystrokes/follow_help.html
 share/lynx_help/keystrokes/gopher_types_help.html
 share/lynx_help/keystrokes/history_help.html
 share/lynx_help/keystrokes/keystroke_help.html
 share/lynx_help/keystrokes/movement_help.html
 share/lynx_help/keystrokes/option_help.html
 share/lynx_help/keystrokes/other_help.html
 share/lynx_help/keystrokes/print_help.html
 share/lynx_help/keystrokes/scrolling_help.html
 share/lynx_help/keystrokes/test_display.html
 share/lynx_help/keystrokes/visited_help.html
 share/lynx_help/keystrokes/xterm_help.html
 share/lynx_help/lynx-dev.html
 share/lynx_help/lynx_help_main.html
 share/lynx_help/lynx_url_support.html