diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 0f4a2509ad77..e560c74c375a 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -298,13 +298,13 @@ LIB_DISTNAMES?=		${DISTNAME}
 .    endif
 .    if ${linux_ARGS} == rl9
 .      if !empty(SHARE_DISTNAMES)
-SHARE_DISTNAMES:=	${SHARE_DISTNAMES:C/^[a-z0-9]/&\/&/}
+SHARE_DISTNAMES:=	${SHARE_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .      if !empty(BIN_DISTNAMES)
-BIN_DISTNAMES:=		${BIN_DISTNAMES:C/^[a-z0-9]/&\/&/}
+BIN_DISTNAMES:=		${BIN_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .      if !empty(LIB_DISTNAMES)
-LIB_DISTNAMES:=		${LIB_DISTNAMES:C/^[a-z0-9]/&\/&/}
+LIB_DISTNAMES:=		${LIB_DISTNAMES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .      endif
 .    endif
 .    if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Maarch64)) \
@@ -339,7 +339,7 @@ DISTFILES_i386?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
 .    endif
 SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 .    if ${linux_ARGS} == rl9
-SRC_DISTFILES:=		${SRC_DISTFILES:C/^[a-z0-9]/&\/&/}
+SRC_DISTFILES:=		${SRC_DISTFILES:@i@${i:C/^([A-Za-z0-9]).*/\1/:tl}/${i}@}
 .    endif
 
 .    ifdef USE_LINUX_RPM_BAD_PERMS