diff --git a/devel/linux-rl9-lld/Makefile b/devel/linux-rl9-lld/Makefile
index 0027262b2993..9e2cdfb314df 100644
--- a/devel/linux-rl9-lld/Makefile
+++ b/devel/linux-rl9-lld/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	lld
-PORTVERSION=	19.1.7
-DISTVERSIONSUFFIX=	-1.el9
+PORTVERSION=	20.1.8
+DISTVERSIONSUFFIX=	-3.el9
 CATEGORIES=	devel linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	The LLVM Linker for LLVM suite (Rocky Linux ${LINUX_DIST_VER})
 WWW=		http://llvm.org
 
 LICENSE=	GPLv2+
 
 USES=		cpe linux:rl9
 USE_LDCONFIG=	yes
 USE_LINUX=	elfutils-libelf python3
 USE_LINUX_RPM=	yes
 WANT_LINUX32=yes
 
 BIN_DISTNAMES=	${PORTNAME}-${DISTVERSIONFULL}
 LIB_DISTNAMES=	${PORTNAME}-devel-${DISTVERSIONFULL} \
 		${PORTNAME}-libs-${DISTVERSIONFULL}
 # src rpm is missing
 SRC_DISTFILES=
 
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
+PLIST_SUB=	LIBVERSION=${PORTVERSION:R} BINVERSION=${PORTVERSION:R:R}
+
 .include <bsd.port.mk>
diff --git a/devel/linux-rl9-lld/distinfo b/devel/linux-rl9-lld/distinfo
index 7a15b8b35354..796cc2688fd8 100644
--- a/devel/linux-rl9-lld/distinfo
+++ b/devel/linux-rl9-lld/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1750644389
-SHA256 (rocky/l/lld-19.1.7-1.el9.aarch64.rpm) = cd5a65c64424d3b705241047e50cffeb4cfc77cdf2db9ec071b3d1f596725681
-SIZE (rocky/l/lld-19.1.7-1.el9.aarch64.rpm) = 34890
-SHA256 (rocky/l/lld-19.1.7-1.el9.x86_64.rpm) = 5272503a23daba450e2f72ea030f357c5650b7a929bb674a64e25d9419800c12
-SIZE (rocky/l/lld-19.1.7-1.el9.x86_64.rpm) = 34918
-SHA256 (rocky/l/lld-devel-19.1.7-1.el9.aarch64.rpm) = 29c25aa6f836dfe30675655dd4a3d51406108459680fe7789f398b3d7ff651e2
-SIZE (rocky/l/lld-devel-19.1.7-1.el9.aarch64.rpm) = 28303
-SHA256 (rocky/l/lld-devel-19.1.7-1.el9.i686.rpm) = 0db7a0e9bf90154b50764e189efaac8ab01d4b6941801b7c14df61f5327f2b8f
-SIZE (rocky/l/lld-devel-19.1.7-1.el9.i686.rpm) = 28293
-SHA256 (rocky/l/lld-devel-19.1.7-1.el9.x86_64.rpm) = 65bdcb1ccda94925c66000455956a415451f16311f7d3db10fd105e97925d5ad
-SIZE (rocky/l/lld-devel-19.1.7-1.el9.x86_64.rpm) = 28351
-SHA256 (rocky/l/lld-libs-19.1.7-1.el9.aarch64.rpm) = 955c9e8131b57fdcec75abb14c18bfbbc2751f300916fafd454c6eab87479768
-SIZE (rocky/l/lld-libs-19.1.7-1.el9.aarch64.rpm) = 1733249
-SHA256 (rocky/l/lld-libs-19.1.7-1.el9.i686.rpm) = fea48e5bbc791a5883ed11c46a55cd4242babcf96170d492e3bba7c84ff32cd4
-SIZE (rocky/l/lld-libs-19.1.7-1.el9.i686.rpm) = 1959604
-SHA256 (rocky/l/lld-libs-19.1.7-1.el9.x86_64.rpm) = 19549c84de1ca76f1c42fcb1b134feed93d11d8d4eec05c5b2f1897e079991f0
-SIZE (rocky/l/lld-libs-19.1.7-1.el9.x86_64.rpm) = 1856519
+TIMESTAMP = 1765189914
+SHA256 (rocky/l/lld-20.1.8-3.el9.aarch64.rpm) = 915bfcede7380734594f1e004a9a1d21b02a19d96828d4d911c761719557ad7b
+SIZE (rocky/l/lld-20.1.8-3.el9.aarch64.rpm) = 35512
+SHA256 (rocky/l/lld-20.1.8-3.el9.x86_64.rpm) = 521c90a17afa2f68d489aeaa057c17b603d2a84cc9e3afaba8ca5fd5927ed82c
+SIZE (rocky/l/lld-20.1.8-3.el9.x86_64.rpm) = 35413
+SHA256 (rocky/l/lld-devel-20.1.8-3.el9.aarch64.rpm) = 2ac6e8a9da1136e7efd5aacd309699e666d605155c2f9e82f23e3f553888f04d
+SIZE (rocky/l/lld-devel-20.1.8-3.el9.aarch64.rpm) = 31795
+SHA256 (rocky/l/lld-devel-20.1.8-3.el9.i686.rpm) = 457f5484daca6860babb35dd701a831680f72a001b54f248d5f8661753da5d73
+SIZE (rocky/l/lld-devel-20.1.8-3.el9.i686.rpm) = 31765
+SHA256 (rocky/l/lld-devel-20.1.8-3.el9.x86_64.rpm) = 9e6927366486ecaaf6bb64ad129e991360f7bfdcab4a37b35ee58ae544a33866
+SIZE (rocky/l/lld-devel-20.1.8-3.el9.x86_64.rpm) = 31861
+SHA256 (rocky/l/lld-libs-20.1.8-3.el9.aarch64.rpm) = af8ab4cb154b052ad49b72e750b9a8d133d85428fba778a7d97a823702b5a24b
+SIZE (rocky/l/lld-libs-20.1.8-3.el9.aarch64.rpm) = 1808116
+SHA256 (rocky/l/lld-libs-20.1.8-3.el9.i686.rpm) = 8be5c46534342b3d6d935d91b73298d7437fbfb6be637b33cc67996b7bf0bf86
+SIZE (rocky/l/lld-libs-20.1.8-3.el9.i686.rpm) = 2054325
+SHA256 (rocky/l/lld-libs-20.1.8-3.el9.x86_64.rpm) = 3e91347cbe6c49e068c5d7f0cb32b9450bd31b804f63a2858a72fe403fc6712d
+SIZE (rocky/l/lld-libs-20.1.8-3.el9.x86_64.rpm) = 1936460
diff --git a/devel/linux-rl9-lld/pkg-plist.aarch64 b/devel/linux-rl9-lld/pkg-plist.aarch64
index 85a5f69a9851..4281bebea0a9 100644
--- a/devel/linux-rl9-lld/pkg-plist.aarch64
+++ b/devel/linux-rl9-lld/pkg-plist.aarch64
@@ -1,39 +1,80 @@
 usr/bin/ld.lld
 usr/bin/ld64.lld
+usr/bin/ld64.lld-%%BINVERSION%%
+usr/bin/ld.lld-%%BINVERSION%%
 usr/bin/lld
 usr/bin/lld-link
+usr/bin/lld-link-%%BINVERSION%%
+usr/bin/lld-%%BINVERSION%%
 usr/bin/wasm-ld
+usr/bin/wasm-ld-%%BINVERSION%%
 usr/include/lld/Common/Args.h
 usr/include/lld/Common/Arrays.h
 usr/include/lld/Common/CommonLinkerContext.h
 usr/include/lld/Common/DWARF.h
 usr/include/lld/Common/Driver.h
 usr/include/lld/Common/ErrorHandler.h
 usr/include/lld/Common/Filesystem.h
 usr/include/lld/Common/LLVM.h
 usr/include/lld/Common/Memory.h
 usr/include/lld/Common/Reproduce.h
 usr/include/lld/Common/Strings.h
 usr/include/lld/Common/TargetOptionsCommandFlags.h
 usr/include/lld/Common/Timer.h
 usr/include/lld/Common/Version.h
 usr/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/liblldCOFF.so
-usr/lib64/liblldCOFF.so.19.1
+usr/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/liblldCommon.so
-usr/lib64/liblldCommon.so.19.1
+usr/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/liblldELF.so
-usr/lib64/liblldELF.so.19.1
+usr/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/liblldMachO.so
-usr/lib64/liblldMachO.so.19.1
+usr/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/liblldMinGW.so
-usr/lib64/liblldMinGW.so.19.1
+usr/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/liblldWasm.so
-usr/lib64/liblldWasm.so.19.1
+usr/lib64/liblldWasm.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/bin/ld.lld
+usr/lib64/llvm%%BINVERSION%%/bin/ld64.lld
+usr/lib64/llvm%%BINVERSION%%/bin/lld
+usr/lib64/llvm%%BINVERSION%%/bin/lld-link
+usr/lib64/llvm%%BINVERSION%%/bin/wasm-ld
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Args.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Driver.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Memory.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Strings.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Version.h
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfig.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfigVersion.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/share/licenses/lld/LICENSE.TXT
 usr/share/licenses/lld-devel/LICENSE.TXT
 usr/share/licenses/lld-libs/LICENSE.TXT
 usr/share/man/man1/ld.lld.1.gz
+usr/share/man/man1/ld.lld-%%BINVERSION%%.1.gz
diff --git a/devel/linux-rl9-lld/pkg-plist.amd64 b/devel/linux-rl9-lld/pkg-plist.amd64
index a900558ad5e7..82ca9debc476 100644
--- a/devel/linux-rl9-lld/pkg-plist.amd64
+++ b/devel/linux-rl9-lld/pkg-plist.amd64
@@ -1,55 +1,126 @@
 usr/bin/ld.lld
 usr/bin/ld64.lld
+usr/bin/ld64.lld-%%BINVERSION%%
+usr/bin/ld.lld-%%BINVERSION%%
 usr/bin/lld
 usr/bin/lld-link
+usr/bin/lld-link-%%BINVERSION%%
+usr/bin/lld-%%BINVERSION%%
 usr/bin/wasm-ld
+usr/bin/wasm-ld-%%BINVERSION%%
 usr/include/lld/Common/Args.h
 usr/include/lld/Common/Arrays.h
 usr/include/lld/Common/CommonLinkerContext.h
 usr/include/lld/Common/DWARF.h
 usr/include/lld/Common/Driver.h
 usr/include/lld/Common/ErrorHandler.h
 usr/include/lld/Common/Filesystem.h
 usr/include/lld/Common/LLVM.h
 usr/include/lld/Common/Memory.h
 usr/include/lld/Common/Reproduce.h
 usr/include/lld/Common/Strings.h
 usr/include/lld/Common/TargetOptionsCommandFlags.h
 usr/include/lld/Common/Timer.h
 usr/include/lld/Common/Version.h
 usr/lib/cmake/lld/LLDConfig.cmake
 usr/lib/cmake/lld/LLDConfigVersion.cmake
 usr/lib/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib/cmake/lld/LLDTargets.cmake
 usr/lib/liblldCOFF.so
-usr/lib/liblldCOFF.so.19.1
+usr/lib/liblldCOFF.so.%%LIBVERSION%%
 usr/lib/liblldCommon.so
-usr/lib/liblldCommon.so.19.1
+usr/lib/liblldCommon.so.%%LIBVERSION%%
 usr/lib/liblldELF.so
-usr/lib/liblldELF.so.19.1
+usr/lib/liblldELF.so.%%LIBVERSION%%
 usr/lib/liblldMachO.so
-usr/lib/liblldMachO.so.19.1
+usr/lib/liblldMachO.so.%%LIBVERSION%%
 usr/lib/liblldMinGW.so
-usr/lib/liblldMinGW.so.19.1
+usr/lib/liblldMinGW.so.%%LIBVERSION%%
 usr/lib/liblldWasm.so
-usr/lib/liblldWasm.so.19.1
+usr/lib/liblldWasm.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Args.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Driver.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Memory.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Strings.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib/llvm%%BINVERSION%%/include/lld/Common/Version.h
+usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDConfig.cmake
+usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDConfigVersion.cmake
+usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDTargets.cmake
+usr/lib/llvm%%BINVERSION%%/lib/cmake/lld/LLDTargets-relwithdebinfo.cmake
+usr/lib/llvm%%BINVERSION%%/lib/liblldCOFF.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldCOFF.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/lib/liblldCommon.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldCommon.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/lib/liblldELF.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldELF.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/lib/liblldMachO.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldMachO.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/lib/liblldMinGW.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldMinGW.so.%%LIBVERSION%%
+usr/lib/llvm%%BINVERSION%%/lib/liblldWasm.so
+usr/lib/llvm%%BINVERSION%%/lib/liblldWasm.so.%%LIBVERSION%%
 usr/lib64/cmake/lld/LLDConfig.cmake
 usr/lib64/cmake/lld/LLDConfigVersion.cmake
 usr/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
 usr/lib64/cmake/lld/LLDTargets.cmake
 usr/lib64/liblldCOFF.so
-usr/lib64/liblldCOFF.so.19.1
+usr/lib64/liblldCOFF.so.%%LIBVERSION%%
 usr/lib64/liblldCommon.so
-usr/lib64/liblldCommon.so.19.1
+usr/lib64/liblldCommon.so.%%LIBVERSION%%
 usr/lib64/liblldELF.so
-usr/lib64/liblldELF.so.19.1
+usr/lib64/liblldELF.so.%%LIBVERSION%%
 usr/lib64/liblldMachO.so
-usr/lib64/liblldMachO.so.19.1
+usr/lib64/liblldMachO.so.%%LIBVERSION%%
 usr/lib64/liblldMinGW.so
-usr/lib64/liblldMinGW.so.19.1
+usr/lib64/liblldMinGW.so.%%LIBVERSION%%
 usr/lib64/liblldWasm.so
-usr/lib64/liblldWasm.so.19.1
+usr/lib64/liblldWasm.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/bin/ld.lld
+usr/lib64/llvm%%BINVERSION%%/bin/ld64.lld
+usr/lib64/llvm%%BINVERSION%%/bin/lld
+usr/lib64/llvm%%BINVERSION%%/bin/lld-link
+usr/lib64/llvm%%BINVERSION%%/bin/wasm-ld
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Args.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Arrays.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/CommonLinkerContext.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/DWARF.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Driver.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/ErrorHandler.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Filesystem.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/LLVM.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Memory.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Reproduce.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Strings.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/TargetOptionsCommandFlags.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Timer.h
+usr/lib64/llvm%%BINVERSION%%/include/lld/Common/Version.h
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfig.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDConfigVersion.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/cmake/lld/LLDTargets-relwithdebinfo.cmake
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCOFF.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldCommon.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldELF.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMachO.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldMinGW.so.%%LIBVERSION%%
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so
+usr/lib64/llvm%%BINVERSION%%/lib64/liblldWasm.so.%%LIBVERSION%%
 usr/share/licenses/lld/LICENSE.TXT
 usr/share/licenses/lld-devel/LICENSE.TXT
 usr/share/licenses/lld-libs/LICENSE.TXT
 usr/share/man/man1/ld.lld.1.gz
+usr/share/man/man1/ld.lld-%%BINVERSION%%.1.gz