diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile
index 439455fe939e..f6a4a335af1e 100644
--- a/lang/ypsilon/Makefile
+++ b/lang/ypsilon/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	ypsilon
 PORTVERSION=	0.9.6.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	lang scheme
 
 MAINTAINER=	vmagerya@gmail.com
 COMMENT=	Scheme implementation for real-time applications
 WWW=		http://www.littlewingpinball.net/mediawiki/index.php/Ypsilon
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_GITHUB=	yes
 GH_TUPLE=	fujita-y:ypsilon:0.9.6-update3
 
 USES=		gmake
 USE_BINUTILS=	yes
 TEST_TARGET=	check  # XXX: tests fail
 
 MAKE_ARGS=	DATADIR="${DATADIR}"
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} 's/-fno-[a-z-]*//g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "sitelib stdlib" ${STAGEDIR}${DATADIR})
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/*.scm ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/ypsilon/pkg-plist b/lang/ypsilon/pkg-plist
index f78e0dc8d12f..923e5c4ddc0b 100644
--- a/lang/ypsilon/pkg-plist
+++ b/lang/ypsilon/pkg-plist
@@ -1,118 +1,118 @@
 bin/ypsilon
-man/man1/ypsilon.1.gz
+share/man/man1/ypsilon.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.scm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glut-demo.scm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtk-hello.scm
 %%DATADIR%%/sitelib/apropos.scm
 %%DATADIR%%/sitelib/concurrent.scm
 %%DATADIR%%/sitelib/debug.scm
 %%DATADIR%%/sitelib/ffi.scm
 %%DATADIR%%/sitelib/gl.scm
 %%DATADIR%%/sitelib/glut.scm
 %%DATADIR%%/sitelib/match.scm
 %%DATADIR%%/sitelib/pregexp.scm
 %%DATADIR%%/sitelib/slib/format.scm
 %%DATADIR%%/sitelib/socket.scm
 %%DATADIR%%/sitelib/srfi/%3a1.scm
 %%DATADIR%%/sitelib/srfi/%3a13.scm
 %%DATADIR%%/sitelib/srfi/%3a14.scm
 %%DATADIR%%/sitelib/srfi/%3a19.scm
 %%DATADIR%%/sitelib/srfi/%3a26.scm
 %%DATADIR%%/sitelib/srfi/%3a27.scm
 %%DATADIR%%/sitelib/srfi/%3a28.scm
 %%DATADIR%%/sitelib/srfi/%3a38.scm
 %%DATADIR%%/sitelib/srfi/%3a39.scm
 %%DATADIR%%/sitelib/srfi/%3a41.scm
 %%DATADIR%%/sitelib/srfi/%3a42.scm
 %%DATADIR%%/sitelib/srfi/%3a6.scm
 %%DATADIR%%/sitelib/srfi/%3a8.scm
 %%DATADIR%%/sitelib/srfi/%3a9.scm
 %%DATADIR%%/sitelib/srfi/%3a98.scm
 %%DATADIR%%/sitelib/srfi/srfi-1.scm
 %%DATADIR%%/sitelib/srfi/srfi-13.scm
 %%DATADIR%%/sitelib/srfi/srfi-14.scm
 %%DATADIR%%/sitelib/srfi/srfi-19.scm
 %%DATADIR%%/sitelib/srfi/srfi-26.scm
 %%DATADIR%%/sitelib/srfi/srfi-27.scm
 %%DATADIR%%/sitelib/srfi/srfi-28.scm
 %%DATADIR%%/sitelib/srfi/srfi-38.scm
 %%DATADIR%%/sitelib/srfi/srfi-39.scm
 %%DATADIR%%/sitelib/srfi/srfi-41.scm
 %%DATADIR%%/sitelib/srfi/srfi-42.scm
 %%DATADIR%%/sitelib/srfi/srfi-6.scm
 %%DATADIR%%/sitelib/srfi/srfi-8.scm
 %%DATADIR%%/sitelib/srfi/srfi-9.scm
 %%DATADIR%%/sitelib/srfi/srfi-98.scm
 %%DATADIR%%/sitelib/stdio.scm
 %%DATADIR%%/sitelib/streams.scm
 %%DATADIR%%/sitelib/tidbits/define-inline.scm
 %%DATADIR%%/sitelib/tidbits/dotimes.scm
 %%DATADIR%%/sitelib/tidbits/generator.scm
 %%DATADIR%%/sitelib/tidbits/remote-repl.scm
 %%DATADIR%%/sitelib/tidbits/string-split.scm
 %%DATADIR%%/sitelib/time.scm
 %%DATADIR%%/sitelib/trace.scm
 %%DATADIR%%/sitelib/ypsilon/apropos.scm
 %%DATADIR%%/sitelib/ypsilon/c-types.scm
 %%DATADIR%%/sitelib/ypsilon/concurrent.scm
 %%DATADIR%%/sitelib/ypsilon/debug.scm
 %%DATADIR%%/sitelib/ypsilon/ffi.scm
 %%DATADIR%%/sitelib/ypsilon/gl.scm
 %%DATADIR%%/sitelib/ypsilon/glut.scm
 %%DATADIR%%/sitelib/ypsilon/match.scm
 %%DATADIR%%/sitelib/ypsilon/pregexp.scm
 %%DATADIR%%/sitelib/ypsilon/socket.scm
 %%DATADIR%%/sitelib/ypsilon/stdio.scm
 %%DATADIR%%/sitelib/ypsilon/streams.scm
 %%DATADIR%%/sitelib/ypsilon/time.scm
 %%DATADIR%%/sitelib/ypsilon/trace.scm
 %%DATADIR%%/stdlib/core.scm
 %%DATADIR%%/stdlib/core/arithmetic.scm
 %%DATADIR%%/stdlib/core/bytevector-transcoders.scm
 %%DATADIR%%/stdlib/core/bytevectors.scm
 %%DATADIR%%/stdlib/core/chkarg.scm
 %%DATADIR%%/stdlib/core/conditions.scm
 %%DATADIR%%/stdlib/core/control.scm
 %%DATADIR%%/stdlib/core/destructuring.scm
 %%DATADIR%%/stdlib/core/enums.scm
 %%DATADIR%%/stdlib/core/exceptions.scm
 %%DATADIR%%/stdlib/core/files.scm
 %%DATADIR%%/stdlib/core/hashtables.scm
 %%DATADIR%%/stdlib/core/io.scm
 %%DATADIR%%/stdlib/core/lists.scm
 %%DATADIR%%/stdlib/core/optargs.scm
 %%DATADIR%%/stdlib/core/optimize.scm
 %%DATADIR%%/stdlib/core/parameters.scm
 %%DATADIR%%/stdlib/core/r5rs.scm
 %%DATADIR%%/stdlib/core/records.scm
 %%DATADIR%%/stdlib/core/sorting.scm
 %%DATADIR%%/stdlib/core/struct.scm
 %%DATADIR%%/stdlib/core/syntax-case.scm
 %%DATADIR%%/stdlib/core/unicode-assistants.scm
 %%DATADIR%%/stdlib/core/unicode.scm
 %%DATADIR%%/stdlib/rnrs.scm
 %%DATADIR%%/stdlib/rnrs/arithmetic/bitwise.scm
 %%DATADIR%%/stdlib/rnrs/arithmetic/fixnums.scm
 %%DATADIR%%/stdlib/rnrs/arithmetic/flonums.scm
 %%DATADIR%%/stdlib/rnrs/base.scm
 %%DATADIR%%/stdlib/rnrs/bytevectors.scm
 %%DATADIR%%/stdlib/rnrs/conditions.scm
 %%DATADIR%%/stdlib/rnrs/control.scm
 %%DATADIR%%/stdlib/rnrs/enums.scm
 %%DATADIR%%/stdlib/rnrs/eval.scm
 %%DATADIR%%/stdlib/rnrs/exceptions.scm
 %%DATADIR%%/stdlib/rnrs/files.scm
 %%DATADIR%%/stdlib/rnrs/hashtables.scm
 %%DATADIR%%/stdlib/rnrs/io/ports.scm
 %%DATADIR%%/stdlib/rnrs/io/simple.scm
 %%DATADIR%%/stdlib/rnrs/lists.scm
 %%DATADIR%%/stdlib/rnrs/mutable-pairs.scm
 %%DATADIR%%/stdlib/rnrs/mutable-strings.scm
 %%DATADIR%%/stdlib/rnrs/programs.scm
 %%DATADIR%%/stdlib/rnrs/r5rs.scm
 %%DATADIR%%/stdlib/rnrs/records/inspection.scm
 %%DATADIR%%/stdlib/rnrs/records/procedural.scm
 %%DATADIR%%/stdlib/rnrs/records/syntactic.scm
 %%DATADIR%%/stdlib/rnrs/sorting.scm
 %%DATADIR%%/stdlib/rnrs/syntax-case.scm
 %%DATADIR%%/stdlib/rnrs/unicode.scm