diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile
index 9e62f4e83e6b..57f3bbf40180 100644
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -1,75 +1,86 @@
 PORTNAME=	chez-scheme
-PORTVERSION=	9.5.8a
+PORTVERSION=	9.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \
 		http://distfiles.pirateparty.in/ashish/:boot \
 		LOCAL/ashish:boot
-DISTFILES=	csv9.5.8${EXTRACT_SUFX} \
+DISTNAME=	csv${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-boot-ta6fb-${PORTVERSION}.tar.xz:boot \
 		${PORTNAME}-boot-ti3fb-${PORTVERSION}.tar.xz:boot
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Chez Scheme system
 WWW=		https://cisco.github.io/ChezScheme
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libossp-uuid.so:misc/ossp-uuid
 
 USES=		gmake iconv:lib ncurses
 
 OPTIONS_DEFAULT=	X11
 OPTIONS_DEFINE=	X11
 
 HAS_CONFIGURE=	yes
 ALL_TARGET=	build
 CONFLICTS_INSTALL=	petite-chez
 STRIP_FILES=	bin/petite bin/${PORTNAME} bin/${PORTNAME}-script
-CHEZ_LIBDIR=lib/csv9.5.8
-WRKSRC=		${WRKDIR}/csv9.5.8
+CHEZ_LIBDIR=	lib/${DISTNAME:S/.0$//}
 CFLAGS+=	-fPIC
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -luuid
 CONFIGURE_ARGS=	--installprefix=${PREFIX} \
 		--temproot=${STAGEDIR} \
 		--installschemename=${PORTNAME} \
 		--installscriptname=${PORTNAME}-script
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		CHEZ_ARCH=${CHEZ_ARCH} \
 		CHEZ_LIBDIR=${CHEZ_LIBDIR}
 X11_USES=	xorg
 X11_USE=	XORG=x11
 
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64")
 CONFIGURE_ARGS+=	--threads --64 -m=ta6fb
 CHEZ_ARCH=	ta6fb
 .elif (${ARCH} == "i386")
 CONFIGURE_ARGS+=	--threads --32 -m=ti3fb
 CHEZ_ARCH=	ti3fb
 .endif
 
+.if defined(NCURSES_RPATH)
+NCURSES_REPL=	-e 's|-Wl,-rpath,${NCURSESRPATH}||g'
+.else
+NCURSES_REPL=
+.endif
+
 post-patch:
 	${LN} -sf ${WRKDIR}/${CHEZ_ARCH} ${WRKSRC}/boot/
+
+post-configure:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
-		-e 's,/usr/local,${LOCALBASE},g' \
-		-e 's,-liconv,${ICONV_LIB},g' ${WRKSRC}/c/Mf-${CHEZ_ARCH}
+		-e 's,/usr/local,${LOCALBASE},g' ${NCURSES_REPL} \
+		-e 's,-liconv,${ICONV_LIB},g' ${WRKSRC}/${CHEZ_ARCH}/c/Mf-config ${WRKSRC}/c/Mf-${CHEZ_ARCH}
 
 pre-build-X11-off:
 	${ECHO_CMD} '#undef LIBX11' >>${WRKSRC}/c/version.h
 
 post-install:
 .for f in ${STRIP_FILES}
 	@${CHMOD} +w ${STAGEDIR}${PREFIX}/${f}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 	@${CHMOD} -w ${STAGEDIR}${PREFIX}/${f}
 .endfor
+.if ("lib/${DISTNAME}" != "${CHEZ_LIBDIR}")
+	@${MV} ${STAGEDIR}${PREFIX}/lib/${DISTNAME} ${STAGEDIR}${PREFIX}/${CHEZ_LIBDIR}
+.endif
 	@${LN} -sf scheme.boot ${STAGEDIR}${PREFIX}/${CHEZ_LIBDIR}/${CHEZ_ARCH}/${PORTNAME}-script.boot
 
 .include <bsd.port.post.mk>
diff --git a/lang/chez-scheme/distinfo b/lang/chez-scheme/distinfo
index b6c793a7ab91..2caba59939b1 100644
--- a/lang/chez-scheme/distinfo
+++ b/lang/chez-scheme/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1682796733
-SHA256 (csv9.5.8.tar.gz) = e5f8de4e9758cfbbd33caece157a9878fa18f8b2f9aa5e343eeefa14dd555642
-SIZE (csv9.5.8.tar.gz) = 35489260
-SHA256 (chez-scheme-boot-ta6fb-9.5.8a.tar.xz) = bddec1d95b6616d592d2e0dc741e78faf3d7055ceabf8837880eae33a1516226
-SIZE (chez-scheme-boot-ta6fb-9.5.8a.tar.xz) = 2125964
-SHA256 (chez-scheme-boot-ti3fb-9.5.8a.tar.xz) = 3b7ae54ba7da93cb547fbfbc5c2733e72e3e7f5d1681bc185250807a2acd291b
-SIZE (chez-scheme-boot-ti3fb-9.5.8a.tar.xz) = 2072924
+TIMESTAMP = 1693266475
+SHA256 (csv9.6.0.tar.gz) = 9fc70ca7646e8ef3b968f7184435e5df8c22abb751d450761e31ce50d71a660f
+SIZE (csv9.6.0.tar.gz) = 35690840
+SHA256 (chez-scheme-boot-ta6fb-9.6.0.tar.xz) = e5ec8558b0fb0ef39bef7ef0a123e02d421a6e034ee5c76efd93b85a01355093
+SIZE (chez-scheme-boot-ta6fb-9.6.0.tar.xz) = 2132184
+SHA256 (chez-scheme-boot-ti3fb-9.6.0.tar.xz) = 07f2c5b189b7713df150b5ff198e8a7bf37b04932c74b876c5fb377d68550833
+SIZE (chez-scheme-boot-ti3fb-9.6.0.tar.xz) = 2079624