diff --git a/devel/libunicode-contour/Makefile b/devel/libunicode-contour/Makefile
index 7838bbc1e031..9e7001648d9b 100644
--- a/devel/libunicode-contour/Makefile
+++ b/devel/libunicode-contour/Makefile
@@ -1,38 +1,45 @@
 PORTNAME=	libunicode
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-contour
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Modern C++20 Unicode library
 WWW=		https://github.com/contour-terminal/libunicode
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/cmake/Catch2/Catch2Config.cmake:devel/catch2 \
 		UCD>=16.0.0,1:textproc/UCD
 
 USES=		cmake:testing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	contour-terminal
 
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/contour
 
 CMAKE_ARGS=	-DLIBUNICODE_UCD_DIR:STRING=${LOCALBASE}/share/unicode/ucd \
 		${CMAKE_ARGS_${ARCH}}
 CMAKE_ARGS_i386=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
 
-CONFLICTS_INSTALL=	libunicode
+REINPLACE_ARGS=	-i ''
 
 PORTDOCS=	README.md TODO.md
 
 OPTIONS_DEFINE=	DOCS
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/contour
+	${MV} ${STAGEDIR}${PREFIX}/lib/*.* ${STAGEDIR}${PREFIX}/lib/contour
+	${REINPLACE_CMD} -e 's|$${_IMPORT_PREFIX}/lib/|$${_IMPORT_PREFIX}/lib/contour/|' \
+		${STAGEDIR}${PREFIX}/lib/cmake/libunicode/libunicode-targets-${CMAKE_BUILD_TYPE:tl}.cmake
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/libunicode-contour/pkg-plist b/devel/libunicode-contour/pkg-plist
index e7237ec8f7af..d8de5d928c9b 100644
--- a/devel/libunicode-contour/pkg-plist
+++ b/devel/libunicode-contour/pkg-plist
@@ -1,35 +1,35 @@
 bin/unicode-query
 include/libunicode/capi.h
 include/libunicode/codepoint_properties.h
 include/libunicode/convert.h
 include/libunicode/emoji_segmenter.h
 include/libunicode/grapheme_segmenter.h
 include/libunicode/intrinsics.h
 include/libunicode/multistage_table_generator.h
 include/libunicode/multistage_table_view.h
 include/libunicode/run_segmenter.h
 include/libunicode/scan.h
 include/libunicode/scoped_timer.h
 include/libunicode/script_segmenter.h
 include/libunicode/support.h
 include/libunicode/ucd.h
 include/libunicode/ucd_enums.h
 include/libunicode/ucd_fmt.h
 include/libunicode/ucd_ostream.h
 include/libunicode/utf8.h
 include/libunicode/utf8_grapheme_segmenter.h
 include/libunicode/width.h
 include/libunicode/word_segmenter.h
 lib/cmake/libunicode/libunicode-config-version.cmake
 lib/cmake/libunicode/libunicode-config.cmake
 lib/cmake/libunicode/libunicode-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libunicode/libunicode-targets.cmake
-lib/libunicode.so
-lib/libunicode.so.0.6
-lib/libunicode.so.0.6.0
-lib/libunicode_loader.so
-lib/libunicode_loader.so.0.6
-lib/libunicode_loader.so.0.6.0
-lib/libunicode_ucd.so
-lib/libunicode_ucd.so.0.6
-lib/libunicode_ucd.so.0.6.0
+lib/contour/libunicode.so
+lib/contour/libunicode.so.0.6
+lib/contour/libunicode.so.0.6.0
+lib/contour/libunicode_loader.so
+lib/contour/libunicode_loader.so.0.6
+lib/contour/libunicode_loader.so.0.6.0
+lib/contour/libunicode_ucd.so
+lib/contour/libunicode_ucd.so.0.6
+lib/contour/libunicode_ucd.so.0.6.0